lkml.org 
[lkml]   [2005]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] (2/22) compile fixes for dmsound (static vs. extern)
From
Date
sound/oss/dmasound/dmasound_atari.c has static expand_bal
sound/oss/dmasound/dmasound_q40.c has static expand_bal
sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal
sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c
all 4 include dmasound.h; extern for expand_bal used to be there,
which is a bloody bad idea, considering _atari and _q40. Moved the
extern to trans_16.c.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC13-rc7-dmasound-lvalues/sound/oss/dmasound/dmasound.h RC13-rc7-dmasound-extern/sound/oss/dmasound/dmasound.h
--- RC13-rc7-dmasound-lvalues/sound/oss/dmasound/dmasound.h 2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc7-dmasound-extern/sound/oss/dmasound/dmasound.h 2005-08-25 00:54:05.000000000 -0400
@@ -270,7 +270,6 @@
#define SW_INPUT_VOLUME_SCALE 4
#define SW_INPUT_VOLUME_DEFAULT (128 / SW_INPUT_VOLUME_SCALE)

-extern int expand_bal; /* Balance factor for expanding (not volume!) */
extern int expand_read_bal; /* Balance factor for reading */
extern uint software_input_volume; /* software implemented recording volume! */

diff -urN RC13-rc7-dmasound-lvalues/sound/oss/dmasound/trans_16.c RC13-rc7-dmasound-extern/sound/oss/dmasound/trans_16.c
--- RC13-rc7-dmasound-lvalues/sound/oss/dmasound/trans_16.c 2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc7-dmasound-extern/sound/oss/dmasound/trans_16.c 2005-08-25 00:54:05.000000000 -0400
@@ -17,6 +17,7 @@
#include <asm/uaccess.h>
#include "dmasound.h"

+extern int expand_bal; /* Balance factor for expanding (not volume!) */
static short dmasound_alaw2dma16[] ;
static short dmasound_ulaw2dma16[] ;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-08-25 07:24    [W:0.345 / U:0.012 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site