Skip to contentSkip to conversation

Linux 2.6.0-test1-ac2

DISCUSSION Alan Cox 14 participants 18 messages Jul 16, 2003 – Jul 18, 2003 Media (V4L/DVB)

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

2.6.0-test1-ac2
o Fix the generic strncpy (me)
o Fix visws pci build (Andrey Panin)
o Fix make clean on initramfs_data.S (Mikael Pettersson)
o Fix build to use only posix compliant args (Teemu Tervo)
to head and tail
o Fix usb ethernet breakage (David Brownell)
o Small ohci fixes (David Brownell)
o Fix remaming "seperate" typos in sound (Steven Cole)
o Add ikconfig back (Randy Dunlap)
o Fix a via-rhine breakage under load (Roger Luethi)
o Fix isapnp docs (Jochen Hein)
o Fix jffs2 build (Jamey Hicks)
o Fix jbd corrupting console log level (Vita Samel)
o Fix 8139too driver with swsuspend (Peter Osterlund)
o Fix seq8005 driver (me)
o Possible synaptics touchpad fix (Peter Osterlund)
| Please report if this helps
o DVB resync (Michael Hunold)
o Fix cyrix mtrr breakage (Zoltán Böszörményi)
o ppp async xon/xoff support (Samuel Thibault)
o Fix non ISA requestirq in pcmcia (Taral)
o First cut at fixing ftape for new locking (Paulo Andre)
o Fix typo in kernel/sched docs (Jasper Spaans)
o Replace illegal with invalid in the many places (Steven Cole)
its wrongly used
o Fix mtrr printk levels (me)
o Fix mtrr in 2.5 missing check for corrupting (me)
old intel chipset with write combine
o Fix various wrong paths in IDE docs (Helge Hafting)
o Better description for ASIX PCMCIA config (Komuro)
o Fix a usb scanner open/close race (Oliver Neukum)
o Add more USB vendor ids (Henning Meier-Geinitz)
o EMU10K update to match CVS + fixes (Rudo Thomas)
| Again feedback appreciated [except from my speakers]
o Don't assume new intel cpus will have same (Venkatesh Pallipadi)
perf registers
o Further DVB fixes (Michael Hunold)
o IPv6 warning fixes (YOSHIFUJI Hideaki)
o Fix up the AD1816 driver (Thorsten Knabe)
o Initialize nodemgr generation (Zwane Mwaikambo)
o Remove obsolete nfsv3 xdr comment (Frank Cusack)
o Fix problem with NetApp and auth_gss (Frank Cusack)
o Fix iphase use of ioremap under locks (Francois Romieu)
o Make keyboard/console always enabled for (Andi Kleen)
non embedded
o Update Changes and ver_linux (Steven Cole)

2.6.0-test1-ac1
Merge Linus 2.6.0-test1
Revert bogus changes to 3c574/3c589_cs
Revert tcic removals (Linus comment is wrong - we know why and fixes are out 8))
Revert Linus broken spelling change (it is separate) [Cite: Oxford English Dictionary]
Revert btaudio change (my fault - btaudio
memsets the struct)
o sethostname and friends corrupted their data (Stephan Maciej)
on -EFAULT returns
o Fix exec elf loader bugs/holes (me)
o Fix environ race crash (me)
o Fix various proc leaks of data (Solar Designer)
o Fix new style serial driver leaks of data (me)
| Found by Solar Designer, someone needs to fix other old style | drivers
o Fix incorrect credits for ad1980 plugin (me)
o Fix license text for Kalhua driver (me)
o Fix make rpm (Nathan Fredrickson)
o Fix qla1280 corruption (Arjan van de Ven)
o Ad1889 clean up fix (Fracois Romieu)
o Remove ip2 dead wood (Adrian Bunk)
o Remove pcxx dead wood (Adrian Bunk)
o Fix watchdog warnings (Jan Dittmer)
o Device mapper updates (Joe Thornber)
o Update magic numbers table (Fabian Frederick)
o Fix logo bitdepth check (Bob Tracy)
o Fix sock done handling (Jamie Lokier)
o RLIMIT_NPROC fixes (Neil Brown)
o Fix xjack dependancies (Adrian Bunk)
o Remove dead serial stuff (Adrian Bunk)
o Add support for 82801EB/ER TCO timer (Wim Van Sebroeck)
o Backport ZoomVideo PCMCIA support (me)
o Backport fixes for yenta socket hang (me)
o Fix isapnp check_region abuse (me)
o Fix the sym53c8xx irq handler types (me)
o Fix aha1542 warnings (me)
o Remove escaped MOD_INC_USE_COUNT in cs5520 (me)
o Fix pas16 and qlogicfas DMA warnings (me)
o Remove warnings in phonedev (me)
| Still need to make it lock the called module
o Fix up ni65 driver (me)

2.5.75-ac (never released) differences remaining unmerged
o Possible sedlbauer fix (me)
o WM97xx touchscreen plugins (Liam Girdwood)
o CS4281 fixes for new audio (incomplete) (me)
o HAL2 OSS driver (Ladislav Michl)
o Harmony OSS driver (Jean-Christoph Vaugeois, Matthieu Delahaye,
Helge Deller, Alex deVries)
o Cyrix Kahlua audio driver (me)

Stuff on the todo list
Forward port aacraid fixes
Forward port 82092 updates
Check xjack is in sync
Fix phonedev/xjack module handling
Who broke NCR5380 again, more importantly how this time... Final sound polish and commit to mark OSS down as done for 2.6 Look at the horribly out of date 2.5 DRM layer Investigate where some of the framebuffers from 2.4 vanished (eg
stifb)
Plip appears short 2.4 fixes
hfsplus is still 2.4 only too

#1 lore raw
Quoted 2 lines · Alan Cox

2.6.0-test1-ac2
o EMU10K update to match CVS + fixes (Rudo Thomas)

Yes, this made my oops on module-load go away.

Apropos emu10k1. Why is OSS deprecated? I have tried a little to get ALSA working, but it doesn't seem to work. Hint?

By the way, Alan Cox. I think you forgot to increment the ac1 to ac2 somewhere.

Signature · 2 lines
Med Venlig Hilsen/Best Regards/Mit freundlichen Grüßen
Michael Kristensen <[email protected]>
#2 lore raw
Quoted 2 lines · Michael Kristensen

Apropos emu10k1. Why is OSS deprecated? I have tried a little to get ALSA working, but it doesn't seem to work. Hint?

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

Quoted 2 lines

By the way, Alan Cox. I think you forgot to increment the ac1 to ac2 somewhere.

So I did 8)

#3 lore raw
Quoted 4 lines · Alan Cox

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

hmm, it would be really cool if redhat shipped alsa utils......

just a thought -

Joe

#4 lore raw
Quoted 10 lines · joe
Quoted 4 lines · Alan Cox

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

hmm, it would be really cool if redhat shipped alsa utils......

just a thought -

I'd be really shocked if it didn't. Maybe you should search more?

I'm sure the others do, (debian, suse, mandrake, gentoo, etc)

#5 lore raw
Quoted 4 lines · Mike Fedyk
Quoted 1 line · joe
Quoted 9 lines
Quoted 6 lines

hmm, it would be really cool if redhat shipped alsa utils......

just a thought -

I'd be really shocked if it didn't. Maybe you should search more?

That's an excellent "argument from incredulity" but alas, it has fatal flaws.

(10 points if you spot them)

Quoted 3 lines

I'm sure the others do, (debian, suse, mandrake, gentoo, etc)

Indeed they do - but that wasn't the issue at hand

;-)

Best Regards,

Joe

#6 lore raw
In reply to Mike Fedyk
Quoted 1 line · Previously Mike Fedyk

I'm sure the others do, (debian, suse, mandrake, gentoo, etc)

Debian at least has had alsa packages since june 1998. Time sure flies..

Wichert.

Signature · 2 lines
Wichert Akkerman <[email protected]>      It is simple to make things.
http://www.wiggy.net/                     It is hard to make things simple.
#7 lore raw
In reply to joe
Quoted 7 lines · joe
Quoted 4 lines · Alan Cox

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

hmm, it would be really cool if redhat shipped alsa utils......

RedHat doesn't, but other people do, for RedHat products:
http://shrike.freshrpms.net/

Regards,
Luciano Rocha

#8 lore raw

At Thu, 17 Jul 2003 13:28:46 +0100,

Quoted 4 lines · Luciano Miguel Ferreira Rocha
Quoted 2 lines · joe

Alan Cox wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 4 lines

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

hmm, it would be really cool if redhat shipped alsa utils......

RedHat doesn't, but other people do, for RedHat products:
http://shrike.freshrpms.net/

they are also in planet CCARMA, as well as many other sound/audio related rpms for redhat:

http://www-ccrma.stanford.edu/planetccrma/software/

Signature · 2 lines
Takashi Iwai <[email protected]>		SuSE Linux AG - www.suse.de
ALSA Developer				ALSA Project - www.alsa-project.org
#9 lore raw
In reply to Alan Cox
Quoted 8 lines · Alan Cox
Quoted 2 lines · Michael Kristensen

Apropos emu10k1. Why is OSS deprecated? I have tried a little to get ALSA working, but it doesn't seem to work. Hint?

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

What I do not understand is why alsa has not gone into 2.4. This will smooth transition to 2.6. Same as i2c. People starts using alsa, then they switch to 2.6 and everything works.

Signature · 4 lines
J.A. Magallon <[email protected]>      \                 Software is like sex:
werewolf.able.es                         \           It's better when it's free
Mandrake Linux release 9.2 (Cooker) for i586
Linux 2.4.22-pre5-jam1m (gcc 3.3.1 (Mandrake Linux 9.2 3.3.1-0.2mdk))
#10 lore raw
Quoted 6 lines · J.A. Magallon
Quoted 4 lines · Alan Cox
Quoted 2 lines · Michael Kristensen

Apropos emu10k1. Why is OSS deprecated? I have tried a little to get ALSA working, but it doesn't seem to work. Hint?

Quoted 8 lines
Quoted 4 lines

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

What I do not understand is why alsa has not gone into 2.4. This will smooth transition to 2.6. Same as i2c. People starts using alsa, then they switch to 2.6 and everything works.

People use OSS in 2.4 and the smooth transition is to continue to use OSS in 2.6.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#11 lore raw
Quoted 1 line · Adrian Bunk

On Thu, Jul 17, 2003 at 01:33:59AM +0200, J.A. Magallon wrote:

[...]

Quoted 5 lines

People use OSS in 2.4 and the smooth transition is to continue to use OSS in 2.6.

cu
Adrian

Hummph... I've intermitently been trying to make alsa work on the so-called AC97 chipset on my motherboard for something in excess of 2 years now. Alsa development has been at a snails pace and probably won't get to my current Biostar M7-VIB mobo before its obsolete.

OSS? Works out of the box, cost me IIRC a 20 dollar bill, and has been updated at least 10 times since I first paid the shareware fee. IMO money well spent.

If OSS does not work in 2.6, then it'll be a while before I'm doing 2.6. But I suspect it will be just fine by the time the real 2.6.0 is out.

Signature · 7 lines
Cheers, Gene
AMD K6-III@500mhz 320M
Athlon1600XP@1400mhz  512M
99.26% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attornies please note, additions to this message
by Gene Heskett are:
Copyright 2003 by Maurice Eugene Heskett, all rights reserved.
#12 lore raw
In reply to J.A. Magallon
Quoted 6 lines · J.A. Magallon
Quoted 4 lines · Alan Cox
Quoted 2 lines · Michael Kristensen

Apropos emu10k1. Why is OSS deprecated? I have tried a little to get ALSA working, but it doesn't seem to work. Hint?

Quoted 8 lines
Quoted 4 lines

ALSA has a lot more functionality than OSS and the API is better in many ways. The ALSA drivers dont have so much use and exposure so they will need time to shake down, but it should be worth it in the end.

What I do not understand is why alsa has not gone into 2.4. This will smooth transition to 2.6. Same as i2c. People starts using alsa, then they switch to 2.6 and everything works.

I would assume that it's time to stop backporting stuff to 2.4, leave it stable and let the new cacpabilities entice people to move to 2.6.

I've had enough learning experiences with ALSA to convince me that both the code and the documentation have a few rough edges. I'd love to just be able to use sound hardware instead of fighting every system trying get the options right, find and download the right tools and software versions, recompile this and that...

Signature · 3 lines
bill davidsen <[email protected]>
  CTO, TMR Associates, Inc
Doing interesting things with little computers since 1979.
#13 lore raw

2.6.0-test1-ac2: multiple definitions of hexium_*

In reply to Alan Cox
Quoted 4 lines · Alan Cox

2.6.0-test1-ac2
...
o DVB resync (Michael Hunold)
...

I got the following compile error:

<-- snip -->

...
LD drivers/media/video/built-in.o
drivers/media/video/hexium_gemini.o(.data+0x4): multiple definition of `hexium_num'
drivers/media/video/hexium_orion.o(.data+0x4): first defined here drivers/media/video/hexium_gemini.o(.init.text+0x0): In function `hexium_init_module':
: multiple definition of hexium_init_module' drivers/media/video/hexium_orion.o(.init.text+0x0): first defined here drivers/media/video/hexium_gemini.o(.exit.text+0x0): In function hexium_cleanup_module':
: multiple definition of `hexium_cleanup_module' drivers/media/video/hexium_orion.o(.exit.text+0x0): first defined here make[3]: *** [drivers/media/video/built-in.o] Error 1 make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2

<-- snip -->

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#14 lore raw

Re: 2.6.0-test1-ac2: multiple definitions of hexium_*

Hello Adrian, Alan,

Quoted 17 lines

I got the following compile error:

<-- snip -->
LD drivers/media/video/built-in.o
drivers/media/video/hexium_gemini.o(.data+0x4): multiple definition of hexium_num' drivers/media/video/hexium_orion.o(.data+0x4): first defined here drivers/media/video/hexium_gemini.o(.init.text+0x0): In function hexium_init_module':
: multiple definition of hexium_init_module' drivers/media/video/hexium_orion.o(.init.text+0x0): first defined here drivers/media/video/hexium_gemini.o(.exit.text+0x0): In function hexium_cleanup_module':
: multiple definition of `hexium_cleanup_module' drivers/media/video/hexium_orion.o(.exit.text+0x0): first defined here make[3]: *** [drivers/media/video/built-in.o] Error 1
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2

Quoted 1 line

<-- snip -->

Thanks for reporting!

Some stuff was not delared static, additionaly some dependencies to i2c and between saa7146 and hexium were missing, the following patch fixes all this.

Quoted 2 lines

cu
Adrian

@ Alan: Many thanks for adding the patches to your ac tree! This makes my life a lot easier!

CU
Michael.

[V4L] - fix static build for hexium_gemini and hexium_orion drivers (Thanks to Adrian Bunk <[email protected]> for reporting this) [V4L] - set debug verbosity to 0 for hexium_gemini and hexium_orion drivers
[V4L] - make hexium_gemini and hexium_orion drivers depdend on i2c module
[V4L] - make saa7146 module depend on hexium_gemini and hexium_orion drivers
[V4L] - let the saa7146 i2c bus report itself as I2C_ADAP_CLASS_TV_ANALOG

drivers/media/common/Kconfig +3 -3
diff -urwb linux-2.6.0-test1.patch/drivers/media/common/Kconfig linux-2.6.0-test1.work/drivers/media/common/Kconfig
@@ -1,8 +1,8 @@
 config VIDEO_SAA7146
         tristate
-        default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y
-        default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m
-        depends on VIDEO_DEV && PCI
+        default y if DVB_AV7110=y || DVB_BUDGET=y || DVB_BUDGET_AV=y || VIDEO_MXB=y || VIDEO_DPC=y || VIDEO_HEXIUM_ORION=y || VIDEO_HEXIUM_GEMINI=y
+        default m if DVB_AV7110=m || DVB_BUDGET=m || DVB_BUDGET_AV=m || VIDEO_MXB=m || VIDEO_DPC=m || VIDEO_HEXIUM_ORION=m || VIDEO_HEXIUM_GEMINI=m
+        depends on VIDEO_DEV && PCI && I2C
 
 config VIDEO_VIDEOBUF
         tristate
drivers/media/common/saa7146_i2c.c +1 -0
diff -urwb linux-2.6.0-test1.patch/drivers/media/common/saa7146_i2c.c linux-2.6.0-test1.work/drivers/media/common/saa7146_i2c.c
@@ -419,6 +419,7 @@
 		i2c_adapter->id 	   = I2C_ALGO_SAA7146;
 		i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
 		i2c_adapter->retries = SAA7146_I2C_RETRIES;
+		i2c_adapter->class = I2C_ADAP_CLASS_TV_ANALOG;
 	}
 	
 	return 0;
drivers/media/video/Kconfig +2 -2
diff -urwb linux-2.6.0-test1.patch/drivers/media/video/Kconfig linux-2.6.0-test1.work/drivers/media/video/Kconfig
@@ -259,7 +259,7 @@
 
 config VIDEO_HEXIUM_ORION
 	tristate "Hexium HV-PCI6 and Orion frame grabber"
-	depends on VIDEO_DEV && PCI
+	depends on VIDEO_DEV && PCI && I2C
 	---help---
 	  This is a video4linux driver for the Hexium HV-PCI6 and
 	  Orion frame grabber cards by Hexium.
@@ -271,7 +271,7 @@
 
 config VIDEO_HEXIUM_GEMINI
 	tristate "Hexium Gemini frame grabber"
-	depends on VIDEO_DEV && PCI
+	depends on VIDEO_DEV && PCI && I2C
 	---help---
 	  This is a video4linux driver for the Hexium Gemini frame
 	  grabber card by Hexium. Please note that the Gemini Dual
drivers/media/video/hexium_gemini.c +4 -4
diff -urwb linux-2.6.0-test1.patch/drivers/media/video/hexium_gemini.c linux-2.6.0-test1.work/drivers/media/video/hexium_gemini.c
@@ -25,12 +25,12 @@
 
 #include <media/saa7146_vv.h>
 
-static int debug = 255;
+static int debug = 0;
 MODULE_PARM(debug, "i");
 MODULE_PARM_DESC(debug, "debug verbosity");
 
 /* global variables */
-int hexium_num = 0;
+static int hexium_num = 0;
 
 #include "hexium_gemini.h"
 
@@ -388,7 +388,7 @@
 	.irq_func = NULL,
 };
 
-int __init hexium_init_module(void)
+static int __init hexium_init_module(void)
 {
 	if (0 != saa7146_register_extension(&hexium_extension)) {
 		DEB_S(("failed to register extension.\n"));
@@ -398,7 +398,7 @@
 	return 0;
 }
 
-void __exit hexium_cleanup_module(void)
+static void __exit hexium_cleanup_module(void)
 {
 	saa7146_unregister_extension(&hexium_extension);
 }
drivers/media/video/hexium_orion.c +1 -1
diff -urwb linux-2.6.0-test1.patch/drivers/media/video/hexium_orion.c linux-2.6.0-test1.work/drivers/media/video/hexium_orion.c
@@ -25,7 +25,7 @@
 
 #include <media/saa7146_vv.h>
 
-static int debug = 255;
+static int debug = 0;
 MODULE_PARM(debug, "i");
 MODULE_PARM_DESC(debug, "debug verbosity");
 
#15 lore raw

2.6.0-test1-ac2: ac97_plugin_wm97xx.c doesn't compile non-modular

In reply to Alan Cox
Quoted 5 lines · Alan Cox

...
2.5.75-ac (never released) differences remaining unmerged
...
o WM97xx touchscreen plugins (Liam Girdwood)
...

ac97_plugin_wm97xx.c doesn't compile non-modular:

<-- snip -->

...
CC sound/oss/ac97_plugin_wm97xx.o
sound/oss/ac97_plugin_wm97xx.c: In function `wm97xx_ts_setup':
sound/oss/ac97_plugin_wm97xx.c:1274: warning: implicit declaration of function `strtok'
sound/oss/ac97_plugin_wm97xx.c:1274: warning: assignment makes pointer from integer without a cast sound/oss/ac97_plugin_wm97xx.c:1275: warning: assignment makes pointer from integer without a cast
...
LD .tmp_vmlinux1
sound/built-in.o(.init.text+0xc4f1): In function `wm97xx_ts_setup':
: undefined reference to strtok' sound/built-in.o(.init.text+0xc704): In function wm97xx_ts_setup':
: undefined reference to `strtok'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#16 lore raw

Re: 2.6.0-test1-ac2: ac97_plugin_wm97xx.c doesn't compile non-modular

Quoted 1 line

ac97_plugin_wm97xx.c doesn't compile non-modular:

Missing linux/string.h perhaps ?

#17 lore raw

Re: 2.6.0-test1-ac2: ac97_plugin_wm97xx.c doesn't compile non-modular

Quoted 3 lines · Alan Cox
Quoted 1 line

ac97_plugin_wm97xx.c doesn't compile non-modular:

Missing linux/string.h perhaps ?

No, strtok was removed from 2.6.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed