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;
 }