linux-apus-devel

dmasound changes (fwd)

[Geert U. <Gee...@so...>]

Anyone with some spare time? I gave it a quick try, but compilation failed.

The Linux/PPC bk _2_4 tree can be found at

    bk://ppc@ppc.bkserver.net/linuxppc_2_4

Yes, you need BitKeeper :-)

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven ------------- Sony Software Development Center Europe (SDCE)
Gee...@so... ------------------- Sint-Stevens-Woluwestraat 55
Voice +32-2-2908453 Fax +32-2-7262686 ---------------- B-1130 Brussels, Belgium

---------- Forwarded message ----------
Date: Thu, 3 Nov 2033 00:54:53 +0100
From: Benjamin Herrenschmidt <be...@ke...>
To: Geert Uytterhoeven <ge...@li...>
Subject: dmasound changes

Hi Geert !

I've pushed most of the remaining pmac bits to the bk _2_4 tree,
including some long standing dmasound changes.

I'm about to send all of this to Marcelo, I'd like to get your
ack about not breaking the amiga/atari stuff however.

Regards,
Ben.

Re: dmasound changes (fwd)

[Michel <mic...@ii...>]

On Sun, 2001-12-02 at 16:28, Geert Uytterhoeven wrote:
>=20
> Anyone with some spare time? I gave it a quick try, but compilation faile=
d.
>=20
> The Linux/PPC bk _2_4 tree can be found at
>=20
>     bk://ppc@ppc.bkserver.net/linuxppc_2_4
>=20
> Yes, you need BitKeeper :-)

Or rsync source.mvista.com::


--=20
Earthling Michel D=E4nzer (MrCooper)/ Debian GNU/Linux (powerpc) developer
XFree86 and DRI project member   /  CS student, Free Software enthusiast

Re: dmasound changes (fwd)

[Jes S. <je...@tr...>]

>>>>> "Geert" == Geert Uytterhoeven <Gee...@so...> writes:

Geert> Anyone with some spare time? I gave it a quick try, but
Geert> compilation failed.

Geert> The Linux/PPC bk _2_4 tree can be found at

Geert>     bk://ppc@ppc.bkserver.net/linuxppc_2_4

Geert> Yes, you need BitKeeper :-)

Or maybe you would care to post a patch so one doesn't have to install
BK to look at it.

Jes

Re: dmasound changes (fwd)

[Benjamin H. <be...@ke...>]

>Geert> Anyone with some spare time? I gave it a quick try, but
>Geert> compilation failed.
>
>Geert> The Linux/PPC bk _2_4 tree can be found at
>
>Geert>     bk://ppc@ppc.bkserver.net/linuxppc_2_4
>
>Geert> Yes, you need BitKeeper :-)
>
>Or maybe you would care to post a patch so one doesn't have to install
>BK to look at it.

Well, I finally sent it all to Marcello, it should be in pre5, it's
always time to fix eventual breakage before he releases final.

The patch of dmasound itself is below (on PPC it needs additional
arch stuffs to compile though).

Re: dmasound changes (fwd)

[Roman Z. <zi...@li...>]

Hi,

On Sun, 2 Dec 2001, Geert Uytterhoeven wrote:

> Anyone with some spare time?

That's really a problem... :(

> I've pushed most of the remaining pmac bits to the bk _2_4 tree,
> including some long standing dmasound changes.

I included a bit older version from Iain in APUS, below is an updated
patch.

bye, Roman

--- drivers/sound/dmasound/dmasound_core.c	Wed Dec  5 23:42:07 2001
+++ drivers/sound/dmasound/dmasound_core.c	Thu Dec  6 00:06:08 2001
@@ -223,15 +223,6 @@
 static int shared_resources_initialised = 0 ;

     /*
-     *  Common stuff
-     */
-
-static long long sound_lseek(struct file *file, long long offset, int orig)
-{
-	return -ESPIPE;
-}
-
-    /*
      *  Mid level stuff
      */

@@ -453,7 +444,7 @@

 static int sq_setup(struct sound_queue *sq)
 {
-	int (*setup_func)(void);
+	int (*setup_func)(void) = NULL;
 	int hard_frame ;

 	if (sq->locked) { /* are we already set? - and not changeable */
@@ -566,6 +557,7 @@
 	 */
 	if (uLeft == 0)
 		return 0;
+	uUsed = 0;

 	/* implement any changes we have made to the soft/hard params.
 	   this is not satisfactory really, all we have done up to now is to
@@ -1645,7 +1637,9 @@
 	}

 	write_sq_release_buffers();
+#ifdef HAS_RECORD
 	read_sq_release_buffers();
+#endif

 	if (mixer_unit >= 0)
 		unregister_sound_mixer(mixer_unit);
--- drivers/sound/dmasound/dmasound_paula.c	Wed Dec  5 23:39:44 2001
+++ drivers/sound/dmasound/dmasound_paula.c	Thu Dec  6 00:10:33 2001
@@ -94,9 +94,11 @@

 #ifdef CONFIG_APUS
 #define mach_heartbeat	ppc_md.heartbeat
+static void (*saved_heartbeat)(int);
+#else
+static void (*saved_heartbeat)(void);
 #endif

-static void (*saved_heartbeat)(int) = NULL;

 static inline void disable_heartbeat(void)
 {
@@ -122,7 +124,7 @@

 static void AmiMixerInit(void);
 static int AmiMixerIoctl(u_int cmd, u_long arg);
-static void AmiWriteSqSetup(void);
+static int AmiWriteSqSetup(void);
 static int AmiStateInfo(char *buffer, size_t space);


@@ -655,10 +657,11 @@
 }


-static void AmiWriteSqSetup(void)
+static int AmiWriteSqSetup(void)
 {
 	write_sq_block_size_half = write_sq.block_size>>1;
 	write_sq_block_size_quarter = write_sq_block_size_half>>1;
+	return 0;
 }