ANN: cmpci 6.67 released

ANN: cmpci 6.67 released

[C.L. Tien - 田承禮]

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


Hi,

I made serveral changes for 6.64, the change are as following:

revision 6.67
date: 2004/03/31 17:56:11;  author: cltien;  state: Exp;  lines: +3 -2
Disable the timed out debug message, nothing wrong.
----------------------------
revision 6.66
date: 2004/03/31 17:42:08;  author: cltien;  state: Exp;  lines: +3 -2
Make sure to call chkintr_mpu401 after attach_mpu401 called.
----------------------------
revision 6.65
date: 2004/03/29 22:58:49;  author: cltien;  state: Exp;  lines: +5 -3
Now the AC3_SW can work on PPC for chip ver 037 or older.

Sincerely,
ChenLi Tien

[-- Attachment #2: cmpci-6.64-6.65.patch --]
[-- Type: application/octet-stream, Size: 1294 bytes --]

Index: cmpci.c
===================================================================
RCS file: /home/cltien/cvs/cmpci/cmpci.c,v
retrieving revision 6.64
retrieving revision 6.65
diff -a -u -r6.64 -r6.65
--- cmpci.c	22 Mar 2004 17:07:02 -0000	6.64
+++ cmpci.c	29 Mar 2004 22:58:49 -0000	6.65
@@ -977,14 +977,16 @@
 {
 	int   i = size / 2;
 	unsigned long data;
+	unsigned short data16;
 	unsigned long *dst = (unsigned long *) dest;
 	unsigned short *src = (unsigned short *)source;
 	int err;
 
 	do {
-		if ((err = __get_user(data, src)))
+		if ((err = __get_user(data16, src)))
 			return err;
 		src++;
+		data = (unsigned long)le16_to_cpu(data16);
 		data <<= 12;			// ok for 16-bit data
 		if (s->spdif_counter == 2 || s->spdif_counter == 3)
 			data |= 0x40000000;	// indicate AC-3 raw data
@@ -996,7 +998,7 @@
 			data |= 5;		// odd, 'W'
 		else
 			data |= 9;		// even, 'M'
-		*dst++ = data;
+		*dst++ = cpu_to_le32(data);
 		s->spdif_counter++;
 		if (s->spdif_counter == 384)
 			s->spdif_counter = 0;
@@ -3208,7 +3210,7 @@
 
 static int __init init_cmpci(void)
 {
-	printk(KERN_INFO "cmpci: version $Revision: 6.64 $ time " __TIME__ " " __DATE__ "\n");
+	printk(KERN_INFO "cmpci: version $Revision: 6.65 $ time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&cm_driver);
 }
 

[-- Attachment #3: cmpci-6.65-6.66.patch --]
[-- Type: application/octet-stream, Size: 1085 bytes --]

Index: cmpci.c
===================================================================
RCS file: /home/cltien/cvs/cmpci/cmpci.c,v
retrieving revision 6.65
retrieving revision 6.66
diff -a -u -r6.65 -r6.66
--- cmpci.c	29 Mar 2004 22:58:49 -0000	6.65
+++ cmpci.c	31 Mar 2004 17:42:08 -0000	6.66
@@ -1550,7 +1550,7 @@
 	spin_unlock(&s->lock);
 #ifdef CONFIG_SOUND_CMPCI_MIDI
 	if (intsrc & 0x00010000) {	// UART interrupt
-		if (intchk_mpu401((void *)s->midi_devc))
+		if (s->midi_devc && intchk_mpu401((void *)s->midi_devc))
 			mpuintr(irq, (void *)s->midi_devc, regs);
 		else
 			inb(s->iomidi);// dummy read
@@ -3071,6 +3071,7 @@
 	}
 #endif
 #ifdef CONFIG_SOUND_CMPCI_MIDI
+	s->midi_devc = 0;
 	/* disable MPU-401 */
 	maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0x04, 0);
 	s->mpu_data.name = "cmpci mpu";
@@ -3210,7 +3211,7 @@
 
 static int __init init_cmpci(void)
 {
-	printk(KERN_INFO "cmpci: version $Revision: 6.65 $ time " __TIME__ " " __DATE__ "\n");
+	printk(KERN_INFO "cmpci: version $Revision: 6.66 $ time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&cm_driver);
 }
 

[-- Attachment #4: cmpci-6.66-6.67.patch --]
[-- Type: application/octet-stream, Size: 1308 bytes --]

Index: cmpci.c
===================================================================
RCS file: /home/cltien/cvs/cmpci/cmpci.c,v
retrieving revision 6.66
retrieving revision 6.67
diff -a -u -r6.66 -r6.67
--- cmpci.c	31 Mar 2004 17:42:08 -0000	6.66
+++ cmpci.c	31 Mar 2004 17:56:11 -0000	6.67
@@ -126,6 +126,7 @@
 /* --------------------------------------------------------------------- */
 #undef OSS_DOCUMENTED_MIXER_SEMANTICS
 #undef DMABYTEIO
+#define	DBG(x) {}
 /* --------------------------------------------------------------------- */
 
 #define CM_MAGIC  ((PCI_VENDOR_ID_CMEDIA<<16)|PCI_DEVICE_ID_CMEDIA_CM8338A)
@@ -1906,7 +1907,7 @@
 		tmo = 3 * HZ * (count + s->dma_dac.fragsize) / 2 / s->ratedac;
 		tmo >>= sample_shift[(s->fmt >> CM_CFMT_DACSHIFT) & CM_CFMT_MASK];
 		if (!schedule_timeout(tmo + 1))
-			printk(KERN_DEBUG "cmpci: dma timed out??\n");
+			DBG(printk(KERN_DEBUG "cmpci: dma timed out??\n");)
         }
         remove_wait_queue(&s->dma_dac.wait, &wait);
         set_current_state(TASK_RUNNING);
@@ -3211,7 +3212,7 @@
 
 static int __init init_cmpci(void)
 {
-	printk(KERN_INFO "cmpci: version $Revision: 6.66 $ time " __TIME__ " " __DATE__ "\n");
+	printk(KERN_INFO "cmpci: version $Revision: 6.67 $ time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&cm_driver);
 }
 

Re: ANN: cmpci 6.67 released

[Andrew Morton]

C.L. Tien - _________ <cltien@cmedia.com.tw> wrote:
>
> 
> Hi,
> 
> I made serveral changes for 6.64, the change are as following:

To what kernel do these patches apply?  Certainly not current 2.6.

If you intend to raise 2.6 patches, please ensure that they are against the
latest kernel.org kernel.  And please ensure that the patches are in `patch
-p1' form.  The headers should look like:

--- a/sound/oss/cmpci.c 22 Mar 2004 17:07:02 -0000      6.64
+++ a/sound/oss/cmpci.c 29 Mar 2004 22:58:49 -0000      6.65

Also, a single patch per email is preferred.

Thanks.

RE: ANN: cmpci 6.67 released

[C.L. Tien - 田承禮]

Hi,

Because I subscribed to linux-kernel recently, so I didn't get the patch after the cmpci.c posted (A user posted it). The driver after 6.0 has added kernel patch so I posted patches based on my CVS from them.

To me it is easier to keep one version for kernel 2.4 and 2.6, with a few patches, that keeps driver functions consistent.

I can post changes since my 5.64 (current version for kernel 2.6) and to 6.16 (kernel version for kernel 2.4) and the diff file of 5.64 of mine and the kernel.

Sincerely,
ChenLi Tien


-----Original Message-----
From:	Andrew Morton [mailto:akpm@osdl.org]
Sent:	2004/4/1 [星期四] 上午 01:49
To:	C.L. Tien - 田承禮
Cc:	linux-kernel@vger.kernel.org; linux-audio-dev@music.columbia.edu; 收信群組-網頁 Support 信箱
Subject:	Re: ANN: cmpci 6.67 released
C.L. Tien - _________ <cltien@cmedia.com.tw> wrote:
>
> 
> Hi,
> 
> I made serveral changes for 6.64, the change are as following:

To what kernel do these patches apply?  Certainly not current 2.6.

If you intend to raise 2.6 patches, please ensure that they are against the
latest kernel.org kernel.  And please ensure that the patches are in `patch
-p1' form.  The headers should look like:

--- a/sound/oss/cmpci.c 22 Mar 2004 17:07:02 -0000      6.64
+++ a/sound/oss/cmpci.c 29 Mar 2004 22:58:49 -0000      6.65

Also, a single patch per email is preferred.

Thanks.