[2.5.54][PATCH] SB16 convertation to new PnP layer.

[2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

Hello Adam and All.
Here is patch to sb16.c that makes it posible to compile and use this
driver under 2.5.54-vanilla.
It working for me as module and built in kernel, but it's need testing.
                            Ruslan. 

--- sound/isa/sb/sb16.c~	2003-01-04 17:32:00.000000000 +0300
+++ sound/isa/sb/sb16.c	2003-01-09 19:25:50.000000000 +0300
@@ -23,11 +23,7 @@
 #include <asm/dma.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#ifndef LINUX_ISAPNP_H
-#include <linux/isapnp.h>
-#define isapnp_card pci_bus
-#define isapnp_dev pci_dev
-#endif
+#include <linux/pnp.h>
 #include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/sb16_csp.h>
@@ -77,7 +73,7 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;	/* 0x220,0x240,0x260,0x280 */
@@ -106,7 +102,7 @@
 MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(enable, "Enable SoundBlaster 16 soundcard.");
 MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 MODULE_PARM(isapnp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
 MODULE_PARM_SYNTAX(isapnp, SNDRV_ISAPNP_DESC);
@@ -150,161 +146,130 @@
 
 struct snd_sb16 {
 	struct resource *fm_res;	/* used to block FM i/o region for legacy cards */
-#ifdef __ISAPNP__
-	struct isapnp_dev *dev;
+#ifdef CONFIG_PNP
+	struct pnp_dev *dev;
 #ifdef SNDRV_SBAWE_EMU8000
-	struct isapnp_dev *devwt;
+	struct pnp_dev *devwt;
 #endif
 #endif
 };
 
 static snd_card_t *snd_sb16_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
-#ifdef __ISAPNP__
-
-static struct isapnp_card *snd_sb16_isapnp_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
-static const struct isapnp_card_id *snd_sb16_isapnp_id[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+#ifdef CONFIG_PNP
 
-#define ISAPNP_SB16(_va, _vb, _vc, _device, _audio) \
-	{ \
-		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), } \
-	}
-#define ISAPNP_SBAWE(_va, _vb, _vc, _device, _audio, _awe) \
-	{ \
-		ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
-		devs : { ISAPNP_DEVICE_ID(_va, _vb, _vc, _audio), \
-			 ISAPNP_DEVICE_ID(_va, _vb, _vc, _awe), } \
-	}
+static struct pnp_card *snd_sb16_isapnp_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+static const struct pnp_card_id *snd_sb16_isapnp_id[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 
-static struct isapnp_card_id snd_sb16_pnpids[] __devinitdata = {
+static struct pnp_card_id snd_sb16_pnpids[] = {
 #ifndef SNDRV_SBAWE
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0024,0x0031),
+	{.id = "CTL0024", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0025,0x0031),
+	{.id = "CTL0025", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0026,0x0031),
+	{.id = "CTL0026", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0027,0x0031),
+	{.id = "CTL0027", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0028,0x0031),
+	{.id = "CTL0028", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x0029,0x0031),
+	{.id = "CTL0029", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x002a,0x0031),
+	{.id = "CTL002a", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
 	/* Note: This card has also a CTL0051:StereoEnhance device!!! */
-	ISAPNP_SB16('C','T','L',0x002b,0x0031),
+	{.id = "CTL002b", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster 16 PnP */
-	ISAPNP_SB16('C','T','L',0x002c,0x0031),	
+	{.id = "CTL002c", .driver_data=0, devs: { {.id="CTL0031"}, }},
 	/* Sound Blaster Vibra16S */
-	ISAPNP_SB16('C','T','L',0x0051,0x0001),
+	{.id = "CTL0051", .driver_data=0, devs: { {.id="CTL0001"}, }},
 	/* Sound Blaster Vibra16C */
-	ISAPNP_SB16('C','T','L',0x0070,0x0001),
+	{.id = "CTL0070", .driver_data=0, devs: { {.id="CTL0001"}, }},
 	/* Sound Blaster Vibra16CL - added by ctm@ardi.com */
-	ISAPNP_SB16('C','T','L',0x0080,0x0041),
+	{.id = "CTL0080", .driver_data=0, devs: { {.id="CTL0041"}, }},
 	/* Sound Blaster Vibra16X */
-	ISAPNP_SB16('C','T','L',0x00f0,0x0043),
+	{.id = "CTL00f0", .driver_data=0, devs: { {.id="CTL0043"}, }}
 #else  /* SNDRV_SBAWE defined */
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0035,0x0031,0x0021),
+	{.id = "CTL0035", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0039,0x0031,0x0021),
+	{.id = "CTL0039", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0042,0x0031,0x0021),
+	{.id = "CTL0042", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0043,0x0031,0x0021),
+	{.id = "CTL0043", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
 	/* Note: This card has also a CTL0051:StereoEnhance device!!! */
-	ISAPNP_SBAWE('C','T','L',0x0044,0x0031,0x0021),
+	{.id = "CTL0044", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
 	/* Note: This card has also a CTL0051:StereoEnhance device!!! */
-	ISAPNP_SBAWE('C','T','L',0x0045,0x0031,0x0021),
+	{.id = "CTL0045", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0046,0x0031,0x0021),
+	{.id = "CTL0046", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0047,0x0031,0x0021),
+	{.id = "CTL0047", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0048,0x0031,0x0021),
+	{.id = "CTL0048", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x0054,0x0031,0x0021),
+	{.id = "CTL0054", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x009a,0x0041,0x0021),
+	{.id = "CTL009a", .driver_data=0, devs: { {.id="CTL0041"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x009c,0x0041,0x0021),
+	{.id = "CTL009c", .driver_data=0, devs: { {.id="CTL0041"}, {.id="CTL0021"}, }},
 	/* Sound Blaster 32 PnP */
-	ISAPNP_SBAWE('C','T','L',0x009f,0x0041,0x0021),
+	{.id = "CTL009f", .driver_data=0, devs: { {.id="CTL0041"}, {.id="CTL0021"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x009d,0x0042,0x0022),
+	{.id = "CTL009d", .driver_data=0, devs: { {.id="CTL0042"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP Gold */
-	ISAPNP_SBAWE('C','T','L',0x009e,0x0044,0x0023),
+	{.id = "CTL009e", .driver_data=0, devs: { {.id="CTL0044"}, {.id="CTL0023"}, }},
 	/* Sound Blaster AWE 64 PnP Gold */
-	ISAPNP_SBAWE('C','T','L',0x00b2,0x0044,0x0023),
+	{.id = "CTL00b2", .driver_data=0, devs: { {.id="CTL0044"}, {.id="CTL0023"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00c1,0x0042,0x0022),
+	{.id = "CTL00c1", .driver_data=0, devs: { {.id="CTL0042"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00c3,0x0045,0x0022),
+	{.id = "CTL00c3", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00c5,0x0045,0x0022),
+	{.id = "CTL00c5", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00c7,0x0045,0x0022),
+	{.id = "CTL00c7", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00e4,0x0045,0x0022),
+	{.id = "CTL00e4", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
 	/* Sound Blaster AWE 64 PnP */
-	ISAPNP_SBAWE('C','T','L',0x00e9,0x0045,0x0022),
-	/* Sound Blaster 16 PnP (AWE) */
-	ISAPNP_SBAWE('C','T','L',0x00ed,0x0041,0x0070),
+	{.id = "CTL00e9", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
+	/* Sound Blaster 16 PnP (AWE} */
+	{.id = "CTL00ed", .driver_data=0, devs: { {.id="CTL0041"}, {.id="CTL0070"}, }},
 	/* Generic entries */
-	ISAPNP_SBAWE('C','T','L',ISAPNP_ANY_ID,0x0031,0x0021),
-	ISAPNP_SBAWE('C','T','L',ISAPNP_ANY_ID,0x0041,0x0021),
-	ISAPNP_SBAWE('C','T','L',ISAPNP_ANY_ID,0x0042,0x0022),
-	ISAPNP_SBAWE('C','T','L',ISAPNP_ANY_ID,0x0044,0x0023),
-	ISAPNP_SBAWE('C','T','L',ISAPNP_ANY_ID,0x0045,0x0022),
+	{.id = "CTLXXXX", .driver_data=0, devs: { {.id="CTL0031"}, {.id="CTL0021"}, }},
+	{.id = "CTLXXXX", .driver_data=0, devs: { {.id="CTL0041"}, {.id="CTL0021"}, }},
+	{.id = "CTLXXXX", .driver_data=0, devs: { {.id="CTL0042"}, {.id="CTL0022"}, }},
+	{.id = "CTLXXXX", .driver_data=0, devs: { {.id="CTL0044"}, {.id="CTL0023"}, }},
+	{.id = "CTLXXXX", .driver_data=0, devs: { {.id="CTL0045"}, {.id="CTL0022"}, }},
 #endif /* SNDRV_SBAWE */
-	{ ISAPNP_CARD_END, }
+	{.id="", }
 };
 
-ISAPNP_CARD_TABLE(snd_sb16_pnpids);
+/*ISAPNP_CARD_TABLE(snd_sb16_pnpids);*/
 
 static int __init snd_sb16_isapnp(int dev, struct snd_sb16 *acard)
 {
-	const struct isapnp_card_id *id = snd_sb16_isapnp_id[dev];
-	struct isapnp_card *card = snd_sb16_isapnp_cards[dev];
-	struct isapnp_dev *pdev;
-
-	acard->dev = isapnp_find_dev(card, id->devs[0].vendor, id->devs[0].function, NULL);
-	if (acard->dev->active) {
-		acard->dev = NULL;
-		return -EBUSY;
+	const struct pnp_card_id *id = snd_sb16_isapnp_id[dev];
+	struct pnp_card *card = snd_sb16_isapnp_cards[dev];
+	struct pnp_dev *pdev;
+
+	acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
+	if (!acard->dev) {
+		printk(KERN_ERR PFX "isapnp configure failure (no device or busy)\n");
+		return -ENODEV;
 	}
 #ifdef SNDRV_SBAWE_EMU8000
-	acard->devwt = isapnp_find_dev(card, id->devs[1].vendor, id->devs[1].function, NULL);
-	if (acard->devwt->active) {
-		acard->dev = acard->devwt = NULL;
-		return -EBUSY;
+	acard->devwt = pnp_request_card_device(card, id->devs[1].id, NULL);
+	if (!acard->devwt) {
+		printk(KERN_ERR PFX "isapnp configure failure (no device or busy)\n");
+		return -ENODEV;
 	}
 #endif	
-	/* Audio initialization */
 	pdev = acard->dev;
-	if (pdev->prepare(pdev) < 0)
-		return -EAGAIN;
-	if (port[dev] != SNDRV_AUTO_PORT)
-		isapnp_resource_change(&pdev->resource[0], port[dev], 16);
-	if (mpu_port[dev] != SNDRV_AUTO_PORT)
-		isapnp_resource_change(&pdev->resource[1], mpu_port[dev], 2);
-	if (fm_port[dev] != SNDRV_AUTO_PORT)
-		isapnp_resource_change(&pdev->resource[2], fm_port[dev], 4);
-	if (dma8[dev] != SNDRV_AUTO_DMA)
-		isapnp_resource_change(&pdev->dma_resource[0], dma8[dev], 1);
-	if (dma16[dev] != SNDRV_AUTO_DMA)
-		isapnp_resource_change(&pdev->dma_resource[1], dma16[dev], 1);
-	if (irq[dev] != SNDRV_AUTO_IRQ)
-		isapnp_resource_change(&pdev->irq_resource[0], irq[dev], 1);
-	if (pdev->activate(pdev) < 0) {
-		printk(KERN_ERR PFX "isapnp configure failure (out of resources?)\n");
-		return -EBUSY;
-	}
 	port[dev] = pdev->resource[0].start;
 	mpu_port[dev] = pdev->resource[1].start;
 	fm_port[dev] = pdev->resource[2].start;
@@ -318,7 +283,7 @@
 #ifdef SNDRV_SBAWE_EMU8000
 	/* WaveTable initialization */
 	pdev = acard->devwt;
-	if (pdev->prepare(pdev)<0) {
+/*	if (pdev->prepare(pdev)<0) {
 		acard->dev->deactivate(acard->dev);
 		return -EAGAIN;
 	}
@@ -331,28 +296,13 @@
 		printk(KERN_ERR PFX "WaveTable isapnp configure failure (out of resources?)\n");
 		acard->dev->deactivate(acard->dev);		
 		return -EBUSY;
-	}
+	}*/
 	awe_port[dev] = pdev->resource[0].start;
 	snd_printdd("isapnp SB16: wavetable port=0x%lx\n", pdev->resource[0].start);
 #endif
 	return 0;
 }
-
-static void snd_sb16_deactivate(struct snd_sb16 *acard)
-{
-	if (acard->dev) {
-		acard->dev->deactivate(acard->dev);
-		acard->dev = NULL;
-	}
-#ifdef SNDRV_SBAWE_EMU8000
-	if (acard->devwt) {
-		acard->devwt->deactivate(acard->devwt);
-		acard->devwt = NULL;
-	}
-#endif
-}
-
-#endif /* __ISAPNP__ */
+#endif /* CONFIG_PNP */
 
 static void snd_sb16_free(snd_card_t *card)
 {
@@ -364,8 +314,9 @@
 		release_resource(acard->fm_res);
 		kfree_nocheck(acard->fm_res);
 	}
-#ifdef __ISAPNP__
-	snd_sb16_deactivate(acard);
+#ifdef CONFIG_PNP
+	acard->devwt=NULL;
+	acard->dev=NULL;
 #endif
 }
 
@@ -392,7 +343,7 @@
 		return -ENOMEM;
 	acard = (struct snd_sb16 *) card->private_data;
 	card->private_free = snd_sb16_free;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	if (isapnp[dev] && snd_sb16_isapnp(dev, acard) < 0) {
 		snd_card_free(card);
 		return -EBUSY;
@@ -402,7 +353,7 @@
 	xirq = irq[dev];
 	xdma8 = dma8[dev];
 	xdma16 = dma16[dev];
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	if (!isapnp[dev]) {
 #endif
 	if (xirq == SNDRV_AUTO_IRQ) {
@@ -434,7 +385,7 @@
 	/* non-PnP AWE port address is hardwired with base port address */
 	awe_port[dev] = port[dev] + 0x400;
 #endif
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	}
 #endif
 
@@ -455,7 +406,7 @@
 		return -ENODEV;
 	}
 	chip->mpu_port = mpu_port[dev];
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	if (!isapnp[dev] && (err = snd_sb16dsp_configure(chip)) < 0) {
 #else
 	if ((err = snd_sb16dsp_configure(chip)) < 0) {
@@ -563,7 +514,7 @@
 	for ( ; dev < SNDRV_CARDS; dev++) {
 		if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
 			continue;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 		if (isapnp[dev])
 			continue;
 #endif
@@ -576,10 +527,10 @@
 	return -ENODEV;
 }
 
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 
-static int __init snd_sb16_isapnp_detect(struct isapnp_card *card,
-					 const struct isapnp_card_id *id)
+static int __init snd_sb16_isapnp_detect(struct pnp_card *card,
+					 const struct pnp_card_id *id)
 {
 	static int dev;
 	int res;
@@ -599,7 +550,22 @@
 	return -ENODEV;
 }
 
-#endif /* __ISAPNP__ */
+static void snd_sb16_isapnp_remove(struct pnp_card * card)
+{
+	/*FIX ME*/
+}
+
+static struct pnpc_driver sb16_pnpc_driver = {
+#ifndef SNDRV_SBAWE
+	.name		= "sb16",
+#else
+	.name		= "sbawe",
+#endif
+	.id_table	= snd_sb16_pnpids,
+	.probe		= snd_sb16_isapnp_detect,
+	.remove		= snd_sb16_isapnp_remove
+};
+#endif /* CONFIG_PNP */
 
 static int __init alsa_card_sb16_init(void)
 {
@@ -610,7 +576,7 @@
 	for (dev = 0; dev < SNDRV_CARDS; dev++) {
 		if (!enable[dev] || port[dev] == SNDRV_AUTO_PORT)
 			continue;
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 		if (isapnp[dev])
 			continue;
 #endif
@@ -624,9 +590,9 @@
 	}
 	/* legacy auto configured cards */
 	cards += snd_legacy_auto_probe(possible_ports, snd_sb16_probe_legacy_port);
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	/* ISA PnP cards at last */
-	cards += isapnp_probe_cards(snd_sb16_pnpids, snd_sb16_isapnp_detect);
+	cards += pnpc_register_driver(&sb16_pnpc_driver);
 #endif
 
 	if (!cards) {
@@ -691,7 +657,7 @@
 	       get_option(&str,&seq_ports[nr_dev]) == 2
 #endif
 	       );
-#ifdef __ISAPNP__
+#ifdef CONFIG_PNP
 	if (pnp != INT_MAX)
 		isapnp[nr_dev] = pnp;
 #endif
-----------

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Adam Belay]

On Wed, Jan 08, 2003 at 08:20:13PM +0300, Ruslan U. Zakirov wrote:
> Hello Adam and All.
> Here is patch to sb16.c that makes it posible to compile and use this
> driver under 2.5.54-vanilla.
> It working for me as module and built in kernel, but it's need testing.
>                             Ruslan. 

Hi Ruslan,

I haven't had a chance to test this yet but everything does look ok.  I
think it will be ready once the below function is completed.  Jaroslav,
any comments?  Also, if anyone has a built in wavetable, as previously
mentioned by Zwane, I'd like to hear how this patch works for you.  This
patch makes full use of pnp card services, which is prefered for cards
that have several closely related devices, and it would be great to 
further test those code paths.

Thanks,
Adam

>
> -#endif /* __ISAPNP__ */
> +static void snd_sb16_isapnp_remove(struct pnp_card * card)
> +{
> +	/*FIX ME*/
> +}
> +
>

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

AB> On Wed, Jan 08, 2003 at 08:20:13PM +0300, Ruslan U. Zakirov wrote:
>> Hello Adam and All.
>> Here is patch to sb16.c that makes it posible to compile and use this
>> driver under 2.5.54-vanilla.
>> It working for me as module and built in kernel, but it's need testing.
>>                             Ruslan. 

AB> Hi Ruslan,

AB> I haven't had a chance to test this yet but everything does look ok.  I
AB> think it will be ready once the below function is completed.  Jaroslav,
AB> any comments?  Also, if anyone has a built in wavetable, as previously
AB> mentioned by Zwane, I'd like to hear how this patch works for you.  This
AB> patch makes full use of pnp card services, which is prefered for cards
AB> that have several closely related devices, and it would be great to 
AB> further test those code paths.

AB> Thanks,
AB> Adam

>>
>> -#endif /* __ISAPNP__ */
>> +static void snd_sb16_isapnp_remove(struct pnp_card * card)
>> +{
>> +     /*FIX ME*/
>> +}
>> +
>>
AB> -
AB> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
AB> the body of a message to majordomo@vger.kernel.org
AB> More majordomo info at  http://vger.kernel.org/majordomo-info.html
AB> Please read the FAQ at  http://www.tux.org/lkml/
Hi All!
I've got only one problem with this driver.
It's appear when I remove module and try to probe it again, then
modprobe oopsing. Problem lays somewhere under PCI_HACK.
It have been repaired in 2.5.55 with this patch
Dave Jones <davej@codemonkey.org.uk>:
  o Fix up dma_alloc_coherent with 64bit DMA masks on i386
OK. I've just tested it. It's been fixed.
         Ruslan.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

>> Hello Adam and All.
>> Here is patch to sb16.c that makes it posible to compile and use this
>> driver under 2.5.54-vanilla.
>> It working for me as module and built in kernel, but it's need testing.
>>                             Ruslan. 

AB> Hi Ruslan,

AB> I haven't had a chance to test this yet but everything does look ok.  I
AB> think it will be ready once the below function is completed.  Jaroslav,
AB> any comments?  Also, if anyone has a built in wavetable, as previously
AB> mentioned by Zwane, I'd like to hear how this patch works for you.  This
AB> patch makes full use of pnp card services, which is prefered for cards
AB> that have several closely related devices, and it would be great to 
AB> further test those code paths.

AB> Thanks,
AB> Adam

>>
>> -#endif /* __ISAPNP__ */
>> +static void snd_sb16_isapnp_remove(struct pnp_card * card)
>> +{
>> +     /*FIX ME*/
>> +}
>> +
>>
Hello Adam and Other.
I have got some stupid questions:
1) As I've understood we need to free all reserved resources when
remove function called, am I right?
2) Who decide card is accessible at some time or not?
3) And the last, where is the place of ISA not PnP cards in the device
lists? As I think, they are fit with PnP bus, but their resources
static(not configurable) or it's just lays under ALSA, apears in
/proc/asound only and ALSA internals?
             Ruslan.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Adam Belay]

On Thu, Jan 09, 2003 at 06:35:12PM +0300, Ruslan U. Zakirov wrote:

> 1) As I've understood we need to free all reserved resources when
> remove function called, am I right?

Yes, all resources must be freed or the device will not work if it is
attached to the driver a second time.  This is becuase the driver will
think the device is busy when actually the resources were just never
freed from the previous session.  Also the resources must be freed to
safetly disable the device.


> 2) Who decide card is accessible at some time or not?

This is determined by both the pnp layer and the driver model.  Becuase a
card is a group of devices the individual devices must also not be matched
to more than one driver.  PnP Card Services have a few bugs in this area,
all of which have been resolved in the patch I released last week.  Greg,
could you please forward that to Linus.


> 3) And the last, where is the place of ISA not PnP cards in the device
> lists? As I think, they are fit with PnP bus, but their resources
> static(not configurable) or it's just lays under ALSA, apears in
> /proc/asound only and ALSA internals?

Currently the pnp layer does not support legacy non PnP devices.  I plan
to add support for them soon.  This support should achieve two objectives.
1.) Reserve resources used by the legacy devices
	a.) if the resources match an existing pnp devices, bind to that
	    device
	b.) if they conflict but do not match exactly return an error
	c.) otherwise reserve the resources and prevent pnp devices from
	    using them.
2.) Represent these legacy devices in sysfs.  Maybe the current legacy dir
    could be used or I may have to create "pnp_legacy".  Needs more research.

Regards,
Adam

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

On Thu, 9 Jan 2003, Adam Belay wrote:
> On Thu, Jan 09, 2003 at 06:35:12PM +0300, Ruslan U. Zakirov wrote:
> > 1) As I've understood we need to free all reserved resources when
> > remove function called, am I right?
> 
> Yes, all resources must be freed or the device will not work if it is
> attached to the driver a second time.  This is becuase the driver will
> think the device is busy when actually the resources were just never
> freed from the previous session.  Also the resources must be freed to
> safetly disable the device.
Here I have strange behavior under 2.5.55 vanilla with my patch.
rmmod snd_*
OK, and it understandable for me. We just unload KO(->remove was called)
and didn't free resources(remove is empty now).
modprobe snd_sbawe isapnp=0 (I've got legacy card)
This cause an oops not error(logical behavior as I think because
resources busy), but module loads anyway and sound works.
I must reinstall binutils to install ksymoops, i'll do it tomorow after my
exam.
> 
> 
> > 2) Who decide card is accessible at some time or not?
> 
> This is determined by both the pnp layer and the driver model.  Becuase a
> card is a group of devices the individual devices must also not be matched
> to more than one driver.  PnP Card Services have a few bugs in this area,
> all of which have been resolved in the patch I released last week.  Greg,
> could you please forward that to Linus.
I've this patch and going to try write remove function.

> > 3) And the last, where is the place of ISA not PnP cards in the device
> > lists? As I think, they are fit with PnP bus, but their resources
> > static(not configurable) or it's just lays under ALSA, apears in
> > /proc/asound only and ALSA internals?
> 
> Currently the pnp layer does not support legacy non PnP devices.  I plan
> to add support for them soon.  This support should achieve two objectives.
> 1.) Reserve resources used by the legacy devices
> 	a.) if the resources match an existing pnp devices, bind to that
> 	    device
> 	b.) if they conflict but do not match exactly return an error
> 	c.) otherwise reserve the resources and prevent pnp devices from
> 	    using them.
> 2.) Represent these legacy devices in sysfs.  Maybe the current legacy dir
>     could be used or I may have to create "pnp_legacy".  Needs more research.
OK. Waiting for new changes.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Zwane Mwaikambo]

On Wed, 8 Jan 2003, Ruslan U. Zakirov wrote:

> Hello Adam and All.
> Here is patch to sb16.c that makes it posible to compile and use this
> driver under 2.5.54-vanilla.
> It working for me as module and built in kernel, but it's need testing.
>                             Ruslan.

Which card do you have? Does it have wavetable?

	Zwane
-- 
function.linuxpower.ca

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

On Wed, 8 Jan 2003, Zwane Mwaikambo wrote:

> On Wed, 8 Jan 2003, Ruslan U. Zakirov wrote:
> 
> > Hello Adam and All.
> > Here is patch to sb16.c that makes it posible to compile and use this
> > driver under 2.5.54-vanilla.
> > It working for me as module and built in kernel, but it's need testing.
> >                             Ruslan.
> 
> Which card do you have? Does it have wavetable?
> 
> 	Zwane
> -- 
> function.linuxpower.ca
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 
It's SBAWE32. It's EMU8000.
	Ruslan.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Shawn Starr]

Is this for ALSA or OSS? Right now I have this card on my P233MMX an AWE32 
EMU8000 w/ 2MB installed.

It's using OSS under 2.4 right now and I'd like to try this. Does it work for 
OSS? I don't want to build the ALSA userland tools right now ;-)

Shawn.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Ruslan U. Zakirov]

SS> Is this for ALSA or OSS? Right now I have this card on my P233MMX an AWE32
SS> EMU8000 w/ 2MB installed.

SS> It's using OSS under 2.4 right now and I'd like to try this. Does it work for 
SS> OSS? I don't want to build the ALSA userland tools right now ;-)

SS> Shawn.

SS> -
SS> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
SS> the body of a message to majordomo@vger.kernel.org
SS> More majordomo info at  http://vger.kernel.org/majordomo-info.html
SS> Please read the FAQ at  http://www.tux.org/lkml/
It's only for 2.5.5x and ALSA.
And it does not bring any advantages and features in driver.
            Ruslan.

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Shawn Starr]

What was this patched against? It doesn't go in to 2.5.55 too many
rejects.

On Fri, 10 Jan 2003, Ruslan U. Zakirov wrote:

> SS> Is this for ALSA or OSS? Right now I have this card on my P233MMX an AWE32
> SS> EMU8000 w/ 2MB installed.
>
> SS> It's using OSS under 2.4 right now and I'd like to try this. Does it work for
> SS> OSS? I don't want to build the ALSA userland tools right now ;-)
>
> SS> Shawn.
>
> SS> -
> SS> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> SS> the body of a message to majordomo@vger.kernel.org
> SS> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> SS> Please read the FAQ at  http://www.tux.org/lkml/
> It's only for 2.5.5x and ALSA.
> And it does not bring any advantages and features in driver.
>             Ruslan.
>
>
>

Re: [2.5.54][PATCH] SB16 convertation to new PnP layer.

[Zwane Mwaikambo]

On Fri, 10 Jan 2003, Shawn Starr wrote:

>
> What was this patched against? It doesn't go in to 2.5.55 too many
> rejects.

Applied clean against 2.5.55 here, you must have a broken tree.

zwane@montezuma linux-2.5.55 {0} patch -p0 --dry-run < ~/patch-sb16-alsa-ruslan
patching file sound/isa/sb/sb16.c

-- 
function.linuxpower.ca