[PATCH] ARM: OMAP: Alsa modularisations and support for tsc2101 1/3 (round 2)

[linux-2.6-omap-h63xx.git] / sound / arm / omap-alsa-dma.h

diff --git a/sound/arm/omap-alsa-dma.h b/sound/arm/omap-alsa-dma.h
index 2ac7650abe353380f2d75c292153549a3dc416a5..187e09c1dc448def21552bb7e1c1e731605b8e26 100644 (file)
--- a/sound/arm/omap-alsa-dma.h
+++ b/sound/arm/omap-alsa-dma.h
@@ -1,8 +1,10 @@
 /*  
- * linux/sound/arm/omap-alsa-dma.h
+ * sound/arm/omap-alsa-dma.h
  *
  * Common audio DMA handling for the OMAP processors
  *
+ * Copyright (C) 2006 Mika Laitio <lamikr@cc.jyu.fi>
+ *
  * Copyright (C) 2005 Instituto Nokia de Tecnologia - INdT - Manaus Brazil
  * 
  * Copyright (C) 2004 Texas Instruments, Inc.
@@ -32,28 +34,20 @@
 
 #include "omap-aic23.h"
 
-/************************** GLOBAL MACROS *************************************/
-
-/* Provide the Macro interfaces common across platforms */
-#define DMA_REQUEST(e,s, cb)   {e=omap_request_sound_dma(s->dma_dev, s->id, s, &s->lch);}
-#define DMA_FREE(s)            omap_free_sound_dma(s, &s->lch)
-#define DMA_CLEAR(s)           omap_clear_sound_dma(s)
-
 /************************** GLOBAL DATA STRUCTURES *********************************/
 
 typedef void (*dma_callback_t) (int lch, u16 ch_status, void *data);
 
 /**************** ARCH SPECIFIC FUNCIONS *******************************************/
 
-void omap_clear_sound_dma(struct audio_stream * s);
+void omap_clear_alsa_sound_dma(struct audio_stream * s);
 
-int omap_request_sound_dma(int device_id, const char *device_name,
+int omap_request_alsa_sound_dma(int device_id, const char *device_name,
                           void *data, int **channels);
-int omap_free_sound_dma(void *data, int **channels);
+int omap_free_alsa_sound_dma(void *data, int **channels);
 
-int omap_start_sound_dma(struct audio_stream *s, dma_addr_t dma_ptr,
-                        u_int dma_size);
+int omap_start_alsa_sound_dma(struct audio_stream *s, dma_addr_t dma_ptr,  u_int dma_size);
 
-void omap_audio_stop_dma(struct audio_stream *s);
+void omap_stop_alsa_sound_dma(struct audio_stream *s);
 
 #endif