Skip to contentSkip to conversation

I have add some changes from 2.4.17-pre1 to 2.5.1-pre11

Merge Nicolas Vollmar 2 participants 2 messages Dec 15, 2001

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

I hope some people can test this.
(I do not have much experience in this...)

Merge with 2.4.17-pre1

- Add buggy 440GX to broken pirq blacklist (Arjan Van de Ven)
- Added missing MODULE_LICENSE("GPL") in some (Andreas Krennmair)
modules
- Fix i810 sound driver problems (Andris Pavenis)
- Add new entry to Sound blaster ISAPNP list (Arjan Van de Ven)
- Updated URL for bigphysmem patch in v4l docs (Adrian Bunk)

Nicolas

Documentation/video4linux/Zoran +3 -3
diff -Nur linux/Documentation/video4linux/Zoran linux-2.5.1-pre11/Documentation/video4linux/Zoran
@@ -160,9 +160,9 @@
   set aside the necessary memory during boot time. There seem to be
   several versions of this patch against various kernel versions
   floating around in the net, you may obtain one e.g. from:
-  http://www.polyware.nl/~middelin/patch/bigphysarea-2.2.1.tar.gz You
-  also have to compile your driver AFTER installing that patch in order
-  to get it working
++  http://www.polyware.nl/~middelin/hob-v4l.html#bigphysarea
++  You also have to compile your driver AFTER installing that patch in
++  order to get it working
 
   or
 
arch/i386/kernel/dmi_scan.c +5 -0
diff -Nur linux/arch/i386/kernel/dmi_scan.c linux-2.5.1-pre11/arch/i386/kernel/dmi_scan.c
@@ -572,6 +572,11 @@
 			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0094.P10"),
 			NO_MATCH, NO_MATCH
                         } },
+	{ broken_pirq, "l44GX Bios", {        		/* Bad $PIR */
+			MATCH(DMI_BIOS_VENDOR, "Intel Corporation"),
+			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0120.P12"),
+			NO_MATCH, NO_MATCH
+                        } },
 	{ broken_pirq, "l44GX Bios", {		/* Bad $PIR */
 			MATCH(DMI_BIOS_VENDOR, "Intel Corporation"),
 			MATCH(DMI_BIOS_VERSION,"L440GX0.86B.0125.P13"),
drivers/sound/i810_audio.c +5 -9
diff -Nur linux/drivers/sound/i810_audio.c linux-2.5.1-pre11/drivers/sound/i810_audio.c
@@ -1405,10 +1405,9 @@
 		if (dmabuf->count < 0) {
 			dmabuf->count = 0;
 		}
-		cnt = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count;
-		// this is to make the copy_from_user simpler below
-		if(cnt > (dmabuf->dmasize - swptr))
-			cnt = dmabuf->dmasize - swptr;
+		cnt = dmabuf->dmasize - swptr;
+		if(cnt > (dmabuf->dmasize - dmabuf->count))
+			cnt = dmabuf->dmasize - dmabuf->count;
 		spin_unlock_irqrestore(&state->card->lock, flags);
 
 #ifdef DEBUG2
@@ -1419,16 +1418,13 @@
 		if (cnt <= 0) {
 			unsigned long tmo;
 			// There is data waiting to be played
+			i810_update_lvi(state,0);
 			if(!dmabuf->enable && dmabuf->count) {
 				/* force the starting incase SETTRIGGER has been used */
 				/* to stop it, otherwise this is a deadlock situation */
 				dmabuf->trigger |= PCM_ENABLE_OUTPUT;
 				start_dac(state);
 			}
-			// Update the LVI pointer in case we have already
-			// written data in this syscall and are just waiting
-			// on the tail bit of data
-			i810_update_lvi(state,0);
 			if (file->f_flags & O_NONBLOCK) {
 				if (!ret) ret = -EAGAIN;
 				goto ret;
@@ -1860,7 +1856,7 @@
 		if(dmabuf->mapped)
 			abinfo.bytes = dmabuf->count;
 		else
-			abinfo.bytes = dmabuf->dmasize - dmabuf->count;
+			abinfo.bytes = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count;
 		abinfo.fragments = abinfo.bytes / dmabuf->userfragsize;
 		spin_unlock_irqrestore(&state->card->lock, flags);
 #ifdef DEBUG
drivers/sound/sb_card.c +6 -1
diff -Nur linux/drivers/sound/sb_card.c linux-2.5.1-pre11/drivers/sound/sb_card.c
@@ -347,7 +347,7 @@
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0043),
 		0,0,0,0,
 		0,1,1,-1},
-	{"Sound Blaster AWE 32", 
+	{"Sound Blaster AWE 32",
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0039), 
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
 		0,0,0,0,
@@ -369,6 +369,11 @@
 		0,1,1,-1},
         {"Sound Blaster AWE 32",
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0045),
+		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
+		0,0,0,0,
+		0,1,1,-1},
+	{"Sound Blaster AWE 32",
+		ISAPNP_VENDOR('C','T','L'), ISAPNP_DEVICE(0x0047),
 		ISAPNP_VENDOR('C','T','L'), ISAPNP_FUNCTION(0x0031),
 		0,0,0,0,
 		0,1,1,-1},
fs/inflate_fs/inflate_syms.c +1 -0
diff -Nur linux/fs/inflate_fs/inflate_syms.c linux-2.5.1-pre11/fs/inflate_fs/inflate_syms.c
@@ -19,3 +19,4 @@
 EXPORT_SYMBOL(zlib_fs_inflateReset);
 EXPORT_SYMBOL(zlib_fs_adler32);
 EXPORT_SYMBOL(zlib_fs_inflateSyncPoint);
+MODULE_LICENSE("GPL");
fs/msdos/msdosfs_syms.c +1 -0
diff -Nur linux/fs/msdos/msdosfs_syms.c linux-2.5.1-pre11/fs/msdos/msdosfs_syms.c
@@ -40,3 +40,4 @@
 
 module_init(init_msdos_fs)
 module_exit(exit_msdos_fs)
+MODULE_LICENSE("GPL");
fs/vfat/vfatfs_syms.c +1 -0
diff -Nur linux/fs/vfat/vfatfs_syms.c linux-2.5.1-pre11/fs/vfat/vfatfs_syms.c
@@ -33,3 +33,4 @@
 
 module_init(init_vfat_fs)
 module_exit(exit_vfat_fs)
+MODULE_LICENSE("GPL");
net/packet/af_packet.c +1 -0
diff -Nur linux/net/packet/af_packet.c linux-2.5.1-pre11/net/packet/af_packet.c
@@ -1902,3 +1902,4 @@
 
 module_init(packet_init);
 module_exit(packet_exit);
+MODULE_LICENSE("GPL");
#1 lore raw
Quoted 1 line · Nicolas Vollmar

Merge with 2.4.17-pre1

pre1 was the easy one (no rejects) 8-)
Theres a patch right up to -rc1[*] available at
http://www.codemonkey.org.uk/patches/2.5/

regards,
Dave.

[*] But without the bits that don't make sense to apply.

Signature · 2 lines
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs