[PATCH] ARM: OMAP: OSS: sem2mutex conversion

[linux-2.6-omap-h63xx.git] / sound / oss / omap-audio.h

diff --git a/sound/oss/omap-audio.h b/sound/oss/omap-audio.h
index d3cc11b456fd5bef1f3cba44170d3770ff6a95e2..c039dee3b148c184dc0e14b539197012925792c4 100644 (file)
--- a/sound/oss/omap-audio.h
+++ b/sound/oss/omap-audio.h
@@ -20,6 +20,8 @@
  *  2004/08/12 Nishanth Menon - Modified to integrate Audio requirements on 1610,1710 platforms
  *
  *  2004/04/04 Nishanth menon - Added hooks for power management
+ *
+ *  2005/12/10 Dirk Behme     - Added L/R Channel Interchange fix as proposed by Ajaya Babu
  */
 
 #ifndef __OMAP_AUDIO_H
@@ -75,6 +77,8 @@ typedef struct {
        unsigned stopped:1;     /* might be active but stopped */
        unsigned spin_idle:1;   /* have DMA spin on zeros when idle */
        unsigned linked:1;      /* dma channels linked */
+       int (*hw_start)(void);  /* interface to start HW interface, e.g. McBSP */
+       int (*hw_stop)(void);   /* interface to stop HW interface, e.g. McBSP */
 } audio_stream_t;
 
 /*
@@ -97,7 +101,7 @@ typedef struct {
        int (*hw_suspend) (void);
        int (*hw_resume) (void);
        struct pm_dev *pm_dev;
-       struct semaphore sem;   /* to protect against races in attach() */
+       struct mutex mutex;     /* to protect against races in attach() */
 } audio_state_t;
 
 #ifdef AUDIO_PM