From: Rasmus A. <ra...@ja...> - 2001-01-22 23:37:08
|
Hi. (I have not been able to find a maintainer for this code.) The following patch makes drivers/scsi/fastlane.c check the return code of request_irq and converts (some) error paths to use forward gotos. It applies cleanly against ac10 and 241p9. Comments? --- linux-ac10-clean/drivers/scsi/fastlane.c Mon Oct 16 21:51:16 2000 +++ linux-ac10/drivers/scsi/fastlane.c Sun Jan 21 20:27:17 2001 @@ -96,9 +96,7 @@ * this ID value. Fortunately only Fastlane maps in Z3 space */ if (board < 0x1000000) { - release_mem_region(board+FASTLANE_ESP_ADDR, - sizeof(struct ESP_regs)); - return 0; + goto err_release; } esp = esp_allocate(tpnt, (void *)board+FASTLANE_ESP_ADDR); @@ -146,10 +144,7 @@ if(!address){ printk("Could not remap Fastlane controller memory!"); - scsi_unregister (esp->ehost); - release_mem_region(board+FASTLANE_ESP_ADDR, - sizeof(struct ESP_regs)); - return 0; + goto err_unregister; } @@ -171,8 +166,11 @@ esp->irq = IRQ_AMIGA_PORTS; esp->slot = board+FASTLANE_ESP_ADDR; - request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, - "Fastlane SCSI", esp_intr); + if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, + "Fastlane SCSI", esp_intr)) { + printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", esp_intr); + goto err_unmap; + } /* Controller ID */ esp->scsi_id = 7; @@ -188,6 +186,15 @@ return esps_in_use; } } + return 0; + + err_unmap: + iounmap(board, z->resource.end-board+1); + err_unregister: + scsi_unregister (esp->ehost); + err_release: + release_mem_region(board+FASTLANE_ESP_ADDR, + sizeof(struct ESP_regs)); return 0; } -- Regards, Rasmus(ra...@ja...) "No man is genuinely happy, married, who has to drink worse whiskey than he used to drink when he was single." H.L. Mencken |
From: Piotr T. <du...@ds...> - 2001-01-23 21:43:36
|
i compiled 2.2.10 kernel with sound, but it has bad sample rate (sound is slow). In mpg123 i can set sample rate to 1:2, but in some programs, like smpeg, i can't do it. Anybody know what i have to change in sound drivers or kernel source ?. dus |
From: Michel <mic...@ii...> - 2001-01-23 22:18:39
|
Piotr Tajdus wrote: >=20 > i compiled 2.2.10 kernel with sound, but it has bad sample rate (sound = is > slow). In mpg123 i can set sample rate to 1:2, but in some programs, li= ke > smpeg, i can't do it. Anybody know what i have to change in sound drive= rs > or kernel source ?. Here's a thread in the archive which has a solution: http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+sound+how+%3= F%3F&list=3D3912 Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ Debian GNU/Linux (powerpc) de= veloper CS student, Free Software enthusiast \ XFree86 and DRI project m= ember |
From: Roman Z. <zi...@fh...> - 2001-01-24 00:43:40
|
Hi, On Tue, 23 Jan 2001, Michel D=E4nzer wrote: > > i compiled 2.2.10 kernel with sound, but it has bad sample rate (sound = is > > slow). In mpg123 i can set sample rate to 1:2, but in some programs, li= ke > > smpeg, i can't do it. Anybody know what i have to change in sound drive= rs > > or kernel source ?. >=20 > Here's a thread in the archive which has a solution: >=20 > http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+sound+how+%3= F%3F&list=3D3912 Hmm, if that is about amifb, with latest kernel from cvs you can also do "video=3Damifb:off" or don't compile in amifb at all to get the same effect= =2E bye, Roman |
From: Michel <mic...@ii...> - 2001-01-24 11:05:12
|
Roman Zippel wrote: > > > i compiled 2.2.10 kernel with sound, but it has bad sample rate (so= und > > > is slow). In mpg123 i can set sample rate to 1:2, but in some progr= ams, > > > like smpeg, i can't do it. Anybody know what i have to change in so= und > > > drivers or kernel source ?. > > > > Here's a thread in the archive which has a solution: > > > > http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+sound+ho= w+%3F%3F&list=3D3912 >=20 > Hmm, if that is about amifb, with latest kernel from cvs you can also d= o > "video=3Damifb:off" or don't compile in amifb at all to get the same ef= fect. 2.4 I assume? Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ Debian GNU/Linux (powerpc) de= veloper CS student, Free Software enthusiast \ XFree86 and DRI project m= ember |
From: Roman Z. <zi...@fh...> - 2001-01-24 12:54:09
|
Hi, On Wed, 24 Jan 2001, Michel D=E4nzer wrote: > > > > i compiled 2.2.10 kernel with sound, but it has bad sample rate (so= und > > > > is slow). In mpg123 i can set sample rate to 1:2, but in some progr= ams, > > > > like smpeg, i can't do it. Anybody know what i have to change in so= und > > > > drivers or kernel source ?. > > > > > > Here's a thread in the archive which has a solution: > > > > > > http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+sound+ho= w+%3F%3F&list=3D3912 > >=20 > > Hmm, if that is about amifb, with latest kernel from cvs you can also d= o > > "video=3Damifb:off" or don't compile in amifb at all to get the same ef= fect. >=20 > 2.4 I assume? Yes, after I sent the mail, I saw he asked about 2.2.10. :) bye, Roman |
From: Piotr T. <du...@ds...> - 2001-01-24 13:15:59
|
THX all for your answers. On Wed, 24 Jan 2001, Michel [iso-8859-1] D=E4nzer wrote: > Roman Zippel wrote: > > > > > > Here's a thread in the archive which has a solution: > > > > > > http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+sound+ho= w+%3F%3F&list=3D3912 i read these posts and i recompiled my kernel with amifb and=20 add "video=3Dmap:000011" to my bootstrap, but i lost two consoles.. > >=20 > > Hmm, if that is about amifb, with latest kernel from cvs you can also d= o > > "video=3Damifb:off" or don't compile in amifb at all to get the same ef= fect. in 2.2.10 it don't work. I had kernel without amifb... On Wed, 24 Jan 2001, Alan Buxey wrote: > > did Geerts patch make its way into 2.2.x ? > it don't work with 2.2.10, sound sources are different than sources in 2.3.x i tryed down amiga_audio_min_period and period value in dmasound.c but with inactive chips these doesn't make a sense. here another question: is any patch for 2.3.x who can i compile without any problems ? and where can i find it ? i need kernel with sound & pcmcia (apne). some times ago i tryed compile 2.3.41 with patch from sunsite.auc.dk, but i had problems with sound... dus |
From: Michel <mic...@ii...> - 2001-01-24 15:08:25
|
Piotr Tajdus wrote: > On Wed, 24 Jan 2001, Michel [iso-8859-1] D=E4nzer wrote: >=20 > > Roman Zippel wrote: > > > > > > > > Here's a thread in the archive which has a solution: > > > > > > > > http://www.geocrawler.com/mail/thread.php3?subject=3D44.1kHz+soun= d+how+%3F%3F&list=3D3912 >=20 > i read these posts and i recompiled my kernel with amifb and > add "video=3Dmap:000011" to my bootstrap, but i lost two consoles.. You can add more in /etc/inittab. There is also a hardcoded limit in the kernel, don't know what it is exactly. > here another question: > is any patch for 2.3.x who can i compile without any problems ? and whe= re > can i find it ? > i need kernel with sound & pcmcia (apne). > some times ago i tryed compile 2.3.41 with patch from sunsite.auc.dk, b= ut > i had problems with sound... The best is to get the source out of CVS. Or you can get one of the precompiled test kernels. Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ Debian GNU/Linux (powerpc) de= veloper CS student, Free Software enthusiast \ XFree86 and DRI project m= ember |
From: Piotr T. <du...@ds...> - 2001-01-25 14:53:54
|
On Wed, 24 Jan 2001, Michel [iso-8859-1] D=E4nzer wrote: > You can add more in /etc/inittab. There is also a hardcoded limit in the > kernel, don't know what it is exactly. >=20 now i have video=3Dmap:00000011 :) >=20 >=20 > The best is to get the source out of CVS. >=20 > Or you can get one of the precompiled test kernels. >=20 can you give me any adress where i can download this kernel sources ? dus |
From: Michel <da...@re...> - 2001-01-25 14:59:20
|
Piotr Tajdus wrote: > > The best is to get the source out of CVS. >=20 > can you give me any adress where i can download this kernel sources ? http://linux-apus.sourceforge.net ;) Follow the link to the CVS tree on the right. There are detailed instruct= ions, the module for the 2.4.0 kernel is called 2.3 . Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ Debian GNU/Linux (powerpc) de= veloper CS student, Free Software enthusiast \ XFree86 and DRI project m= ember |
From: Alan B. <al...@ms...> - 2001-01-25 16:30:43
|
hi, > Follow the link to the CVS tree on the right. There are detailed instructions, > the module for the 2.4.0 kernel is called 2.3 . ;-) heh... i did try a co 2.4 earlier today, just to see.... alan |
From: Geert U. <ge...@li...> - 2001-01-25 16:36:35
|
On Thu, 25 Jan 2001, Alan Buxey wrote: > > Follow the link to the CVS tree on the right. There are detailed instructions, > > the module for the 2.4.0 kernel is called 2.3 . > > ;-) heh... i did try a co 2.4 earlier today, just to see.... CVS supports aliases, so it may make sense to create a `2.4' alias for `2.3'. People who want the real 2.3 have to use an explicit label anyway. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li... In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds |
From: Michel <da...@re...> - 2001-01-25 17:13:48
|
Geert Uytterhoeven wrote: >=20 > On Thu, 25 Jan 2001, Alan Buxey wrote: > > > Follow the link to the CVS tree on the right. There are detailed > > > instructions, the module for the 2.4.0 kernel is called 2.3 . > > > > ;-) heh... i did try a co 2.4 earlier today, just to see.... >=20 > CVS supports aliases, so it may make sense to create a `2.4' alias for > `2.3'. > People who want the real 2.3 have to use an explicit label anyway. Good point, I just created the alias. The question is how people can find= out what modules/aliases are available? Thanks, Michel --=20 Earthling Michel D=E4nzer (MrCooper) \ Debian GNU/Linux (powerpc) de= veloper CS student, Free Software enthusiast \ XFree86 and DRI project m= ember |
From: Geert U. <ge...@li...> - 2001-01-25 17:35:07
|
On Thu, 25 Jan 2001, Michel D=E4nzer wrote: > Geert Uytterhoeven wrote: > > On Thu, 25 Jan 2001, Alan Buxey wrote: > > > > Follow the link to the CVS tree on the right. There are detailed > > > > instructions, the module for the 2.4.0 kernel is called 2.3 . > > > > > > ;-) heh... i did try a co 2.4 earlier today, just to see.... > >=20 > > CVS supports aliases, so it may make sense to create a `2.4' alias fo= r > > `2.3'. > > People who want the real 2.3 have to use an explicit label anyway. >=20 > Good point, I just created the alias. The question is how people can fi= nd out > what modules/aliases are available? List them on the website? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m6= 8k.org In personal conversations with technical people, I call myself a hacker. = But when I'm talking to journalists I just say "programmer" or something like= that. -- Linus Torvalds |
From: Piotr T. <du...@ds...> - 2001-01-25 17:46:36
|
some times ago i tryed compiled 2.4.0 kernel from sourceforge and system freeze when i remove my pcmcia card (kingmax), maybe it is a bug.... dus |
From: Piotr T. <du...@ds...> - 2001-01-25 23:24:15
|
i compiled 2.4.0 sources with amiga pcmcia and apne, but when pcmcia card is probing system freeze. has anybody 2.4.0 kernel working with pcmcia ethernet card ? dus |
From: Alan B. <al...@ms...> - 2001-01-25 15:03:36
|
hi, > can you give me any adress where i can download this kernel sources ? use CVS. the source is at sourceforge. cvs -z3 -d:pserver:ano...@cv...:/cvs/linux-apus co 2.3 for example alan |
From: Piotr T. <du...@ds...> - 2001-01-25 16:46:34
|
On Thu, 25 Jan 2001, Alan Buxey wrote: > > use CVS. the source is at sourceforge. > > cvs -z3 > -d:pserver:ano...@cv...:/cvs/linux-apus co 2.3 > i install cvs from debianPPC distribution, but i have little problem because my linux is in local net... can cvs connect through proxy ? i read man, but i find nothing about it :/ dus |
From: Piotr T. <du...@ds...> - 2001-01-25 17:12:50
|
On Thu, 25 Jan 2001, Piotr Tajdus wrote: > > > i install cvs from debianPPC distribution, but i have little problem > because my linux is in local net... > can cvs connect through proxy ? > i read man, but i find nothing about it :/ > ok, i'm connected via ssh forward.. :) dus |
From: Alan B. <al...@ms...> - 2001-01-24 09:54:02
|
hi, > Here's a thread in the archive which has a solution: > > http://www.geocrawler.com/mail/thread.php3?subject=44.1kHz+sound+how+%3F%3F&list=3912 did Geerts patch make its way into 2.2.x ? alan |
From: Alan B. <al...@ms...> - 2001-01-24 09:52:29
|
hi, > i compiled 2.2.10 kernel with sound, but it has bad sample rate (sound is > slow). In mpg123 i can set sample rate to 1:2, but in some programs, like > smpeg, i can't do it. Anybody know what i have to change in sound drivers > or kernel source ?. this is..in the FAQ...and if not soon will be! ;-) you need to make sure your chipset is activated for the higher frequencies. you do this by, for example adding video=amifb:vga to the bootstrap line and the video mapping option of 01 then, after booting (into run level 3!) you switch to the AGA/ECS screen, then back to the gfx card screen. the normal MP playback will now be active alan |
From: Rasmus A. <ra...@ja...> - 2001-01-23 22:10:15
|
On Tue, Jan 23, 2001 at 12:37:18AM +0100, Rasmus Andersen wrote: Hi. This is an updated patch since I messed the one from yesterday up. The comments still apply, though. Apologies for the extra mails. --- linux-ac10-clean/drivers/scsi/fastlane.c Mon Oct 16 21:51:16 2000 +++ linux-ac10/drivers/scsi/fastlane.c Tue Jan 23 22:14:52 2001 @@ -96,9 +96,7 @@ * this ID value. Fortunately only Fastlane maps in Z3 space */ if (board < 0x1000000) { - release_mem_region(board+FASTLANE_ESP_ADDR, - sizeof(struct ESP_regs)); - return 0; + goto err_release; } esp = esp_allocate(tpnt, (void *)board+FASTLANE_ESP_ADDR); @@ -146,10 +144,7 @@ if(!address){ printk("Could not remap Fastlane controller memory!"); - scsi_unregister (esp->ehost); - release_mem_region(board+FASTLANE_ESP_ADDR, - sizeof(struct ESP_regs)); - return 0; + goto err_unregister; } @@ -171,8 +166,11 @@ esp->irq = IRQ_AMIGA_PORTS; esp->slot = board+FASTLANE_ESP_ADDR; - request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, - "Fastlane SCSI", esp_intr); + if (request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, + "Fastlane SCSI", esp_intr)) { + printk(KERN_WARNING "Fastlane: Could not get IRQ%d, aborting.\n", IRQ_AMIGA_PORTS); + goto err_unmap; + } /* Controller ID */ esp->scsi_id = 7; @@ -188,6 +186,15 @@ return esps_in_use; } } + return 0; + + err_unmap: + iounmap((void *)address); + err_unregister: + scsi_unregister (esp->ehost); + err_release: + release_mem_region(z->resource.start+FASTLANE_ESP_ADDR, + sizeof(struct ESP_regs)); return 0; } -- Regards, Rasmus(ra...@ja...) "God prevent we should ever be twenty years without a revolution." -- Thomas Jefferson |