linuxsh-dev

[PATCH/FIX] Add missing define to sh dac driver

[Kristoffer E. <kri...@gm...>]

Greetings,

shortlog: Added missing define TSTR which is needed for compilation, minor cleanup also.

Signed-off-by: Kristoffer Ericson <Kri...@gm...>


diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index b493660..a28be0a 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -32,10 +32,13 @@
 #define MODNAME "sh_dac_audio"
 
 #define TMU_TOCR_INIT	0x00
+#define TIMER1_IRQ      16
 
 #define TMU1_TCR_INIT	0x0020	/* Clock/4, rising edge; interrupt on */
 #define TMU1_TSTR_INIT  0x02	/* Bit to turn on TMU1 */
 
+#define	TSTR 0xfffffe92		/* Byte Access */
+
 #define BUFFER_SIZE 48000
 
 static int rate;
@@ -95,18 +98,19 @@ static void dac_audio_stop(void)
 		outw(v, HD64461_GPADR);
 	}
 
- 	sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
+	sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
 	sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
 }
 
 static void dac_audio_set_rate(void)
 {
 	unsigned long interval;
- 	struct clk *clk;
+	struct clk *clk;
+
+        clk = clk_get(NULL,"module_clk");
+	interval = (clk_get_rate(clk) / 4) / rate;
+	clk_put(clk);
 
- 	clk = clk_get(NULL, "module_clk");
- 	interval = (clk_get_rate(clk) / 4) / rate;
- 	clk_put(clk);
 	ctrl_outl(interval, TMU1_TCOR);
 	ctrl_outl(interval, TMU1_TCNT);
 }


-- 
Kristoffer Ericson <Kri...@Gm...>

Re: [PATCH/FIX] Add missing define to sh dac driver

[Paul M. <le...@li...>]

On Thu, Aug 23, 2007 at 03:05:21PM -0700, Kristoffer Ericson wrote:
> Greetings,
> 
> shortlog: Added missing define TSTR which is needed for compilation, minor cleanup also.
> 
Might fix compilation, but has no hope of ever working. You've already
been told that TMU0 and TMU1 are used by the system, sh_dac_audio will
have to latch on to another channel. Your request_irq() here will
automatically fail, and it seems a bit dubious to be using a timer
channel directly like this anyhow.

Re: [PATCH/FIX] Add missing define to sh dac driver

[Kristoffer E. <kri...@gm...>]

The alsa driver is mostly finished thats why I basicly only fixed it to
compile. Perhaps its better to leave it to its fate?

2007/8/24, Paul Mundt <le...@li...>:
>
> On Thu, Aug 23, 2007 at 03:05:21PM -0700, Kristoffer Ericson wrote:
> > Greetings,
> >
> > shortlog: Added missing define TSTR which is needed for compilation,
> minor cleanup also.
> >
> Might fix compilation, but has no hope of ever working. You've already
> been told that TMU0 and TMU1 are used by the system, sh_dac_audio will
> have to latch on to another channel. Your request_irq() here will
> automatically fail, and it seems a bit dubious to be using a timer
> channel directly like this anyhow.
>