Changeset 587 for GPL/trunk/alsa-kernel/include

Timestamp:

Jun 9, 2016, 10:38:13 PM (9 years ago)

Author:

David Azarewicz

Message:

Rearrange directory structure
rework makefiles
cleanup files

Location:

GPL/trunk/alsa-kernel/include/sound

Files:

• ad1843.h (added)
• ad1848.h (deleted)
• adriver.h (deleted)
• ainstr_fm.h (deleted)
• ainstr_gf1.h (deleted)
• ainstr_iw.h (deleted)
• ainstr_simple.h (deleted)
• asequencer.h (modified) (5 diffs)
• asound.h (modified) (7 diffs)
• atmel-abdac.h (added)
• atmel-ac97c.h (added)
• awacs.h (deleted)
• burgundy.h (deleted)
• compat_22.h (deleted)
• config.h (deleted)
• config.h.in (deleted)
• core.h (modified) (10 diffs)
• cs4231.h (deleted)
• driver.h (deleted)
• gus.ho (deleted)
• hal2.h (deleted)
• hdspm.h (added)
• info.h (modified) (1 diff)
• initval.h (modified) (8 diffs)
• instr.h (deleted)
• isapnp.h (deleted)
• l3.h (added)
• opl3.h (modified) (6 diffs)
• pcm.h (modified) (9 diffs)
• pcm_plugin.h (deleted)
• pcm_sgbuf.h (deleted)
• pmac.h (deleted)
• pxa2xx-lib.h (added)
• s3c24xx_uda134x.h (added)
• seq_instr.h (deleted)
• seq_kernel.h (modified) (1 diff)
• seqmid.h (deleted)
• sh_fsi.h (added)
• sndmagic.h (deleted)
• soc-dai.h (added)
• soundmem.h (deleted)
• sscape_ioctl.h (deleted)
• switch.h (deleted)
• typedefs.h (deleted)
• uda1341.h (deleted)
• uda134x.h (added)
• uda1380.h (added)
• version.h.in (deleted)
• wavefront_fx.h (deleted)
• wm8993.h (added)
• wm9081.h (added)
• wss.h (added)
• yss225.h (deleted)

GPL/trunk/alsa-kernel/include/sound/asequencer.h

@@ -68 +68 @@
 #define SNDRV_SEQ_EVENT_TIMESIGN        23      /* SMF Time Signature event */
 #define SNDRV_SEQ_EVENT_KEYSIGN         24      /* SMF Key Signature event */
-                
+        
 /** timer messages
  * event data type = snd_seq_ev_queue_control
@@ -222 +222 @@
 
         /* external stored data */
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2      
 struct snd_seq_ev_ext {
         unsigned int len;       /* length of data */
@@ -235 +235 @@
 #pragma pack()
 #endif
+
 struct snd_seq_result {
         int event;              /* processed event type */
@@ -273 +274 @@
 
         /* quoted event - inside the kernel only */
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2      
 struct snd_seq_ev_quote {
         struct snd_seq_addr origin;             /* original sender */
@@ -422 +423 @@
 #define USER_CLIENT     ((__force snd_seq_client_type_t) 1)
 #define KERNEL_CLIENT   ((__force snd_seq_client_type_t) 2)
-                        
+
         /* event filter flags */
 #define SNDRV_SEQ_FILTER_BROADCAST      (1<<0)  /* accept broadcast messages */

GPL/trunk/alsa-kernel/include/sound/asound.h

@@ -42 +42 @@
 #endif /* __KERNEL__ **/
 
+#ifdef TARGET_OS2
 #ifndef __force
 #define __force
@@ -50 +51 @@
 #endif
 
-#ifdef TARGET_OS2
 #define SNDRV_PCM_VOL_FRONT_LEFT        0
 #define SNDRV_PCM_VOL_FRONT_RIGHT       1
@@ -323 +323 @@
 typedef int snd_pcm_hw_param_t;
 #define SNDRV_PCM_HW_PARAM_ACCESS       0       /* Access type */
-#ifdef TARGET_OS2
+#ifndef TARGET_OS2
+#define SNDRV_PCM_HW_PARAM_FORMAT       1       /* Format */
+#define SNDRV_PCM_HW_PARAM_SUBFORMAT    2       /* Subformat */
+#else
 #define SNDRV_PCM_HW_PARAM_RATE_MASK    1 /* Format */
-#endif
 #define SNDRV_PCM_HW_PARAM_FORMAT       2       /* Format */
 #define SNDRV_PCM_HW_PARAM_SUBFORMAT    3       /* Subformat */
+#endif
 #define SNDRV_PCM_HW_PARAM_FIRST_MASK   SNDRV_PCM_HW_PARAM_ACCESS
 #define SNDRV_PCM_HW_PARAM_LAST_MASK    SNDRV_PCM_HW_PARAM_SUBFORMAT
@@ -356 +359 @@
 #define SNDRV_PCM_HW_PARAM_LAST_INTERVAL        SNDRV_PCM_HW_PARAM_TICK_TIME
 
-#define SNDRV_PCM_HW_PARAMS_NORESAMPLE          (1<<0)  /* avoid rate resampling */
+#define SNDRV_PCM_HW_PARAMS_NORESAMPLE  (1<<0)  /* avoid rate resampling */
 
 struct snd_interval {
@@ -789 +792 @@
         unsigned int device;            /* device/client number */
         unsigned int subdevice;         /* subdevice (substream) number */
-    unsigned char name[44];             /* ASCII name of item */
+        unsigned char name[44];         /* ASCII name of item */
         unsigned int index;             /* index of item */
 };
@@ -836 +839 @@
         struct snd_ctl_elem_id id;      /* W: element ID */
         unsigned int indirect: 1;       /* W: indirect access - obsoleted */
-    union {
+        union {
                 union {
                         long value[128];
@@ -854 +857 @@
                 } bytes;
                 struct snd_aes_iec958 iec958;
-    } value;                /* RO */
+        } value;                /* RO */
         struct timespec tstamp;
-    unsigned char reserved[128-sizeof(struct timespec)];
+        unsigned char reserved[128-sizeof(struct timespec)];
 };
 

GPL/trunk/alsa-kernel/include/sound/core.h

@@ -23 +23 @@
  */
 #ifdef TARGET_OS2
-#include <sound\config.h>
+#include <config.h>
 #endif
 
@@ -101 +101 @@
 struct snd_monitor_file {
         struct file *file;
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2      
         const struct file_operations *disconnected_f_op;
 #else
         struct file_operations *disconnected_f_op;
-#endif
+#endif  
         struct list_head shutdown_list; /* still need to shutdown */
         struct list_head list;  /* link of monitor files */
@@ -205 +205 @@
         int card;                       /* card number */
         int device;                     /* device number */
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2      
         const struct file_operations *f_ops;    /* file operations */
 #else
         struct file_operations *f_ops;  /* file operations */
-#endif
+#endif  
         void *private_data;             /* private data for f_ops->open */
         struct device *dev;             /* device for sysfs */
@@ -234 +234 @@
 int snd_register_device_for_dev(int type, struct snd_card *card,
                                 int dev,
-#ifndef TARGET_OS2
+#ifndef TARGET_OS2                              
                                 const struct file_operations *f_ops,
 #else
                                 struct file_operations *f_ops,
-#endif
+#endif                          
                                 void *private_data,
                                 const char *name,
@@ -263 +263 @@
 #ifndef TARGET_OS2
                                       const struct file_operations *f_ops,
-#else
+#else                           
                                       struct file_operations *f_ops,
-#endif
+#endif                          
                                       void *private_data,
                                       const char *name)
@@ -285 +285 @@
 #else
                             struct file_operations *f_ops, void *private_data,
-#endif
+#endif                  
                             const char *name);
 int snd_unregister_oss_device(int type, struct snd_card *card, int dev);
@@ -376 +376 @@
 #else
 #define __snd_printk printk
-#endif /* nothing */
+#endif  
 #endif
 
@@ -418 +418 @@
  * When CONFIG_SND_DEBUG is set, this macro evaluates the given condition,
  * and call WARN() and returns the value if it's non-zero.
- * 
+ *
  * When CONFIG_SND_DEBUG is not set, this just returns zero, and the given
  * condition is ignored.
@@ -427 +427 @@
  * If you want to evaluate and give a warning, use standard WARN_ON().
  */
-
 #define snd_BUG_ON(cond)        WARN((cond), "BUG? (%s)\n", __stringify(cond))
 
@@ -449 +448 @@
 #define snd_BUG_ON(cond)        __snd_bug_on(0 && (cond))  /* always false */
 #endif
-
 
 #endif /* CONFIG_SND_DEBUG */

GPL/trunk/alsa-kernel/include/sound/info.h

@@ -111 +111 @@
 #endif
 
-#ifndef TARGET_OS2
 int snd_iprintf(struct snd_info_buffer *buffer, char *fmt, ...) \
                                 __attribute__ ((format (printf, 2, 3)));
-#else
-int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...);
-#endif
 int snd_info_init(void);
 int snd_info_done(void);

GPL/trunk/alsa-kernel/include/sound/initval.h

@@ -22 +22 @@
  */
 
+#ifdef TARGET_OS2
 #ifndef MODULE_GENERIC_STRING
 #ifdef MODULE
@@ -32 +33 @@
 #endif
 
-#ifdef TARGET_OS2
-#define MODULE_CLASSES(val) 
-#define MODULE_DEVICES(val) 
-#define MODULE_PARM_SYNTAX(id, val) 
+#define MODULE_CLASSES(val)
+#define MODULE_DEVICES(val)
+#define MODULE_PARM_SYNTAX(id, val)
 #define module_param_array(name, type, nump, perm)
 #define module_param(name, type, perm)
@@ -52 +52 @@
 #define module_param(name, type, perm) \
         MODULE_PARM(name, SNDRV_MODULE_TYPE_##type)
-
 #endif
 
+#ifndef TARGET_OS2
+#define SNDRV_AUTO_PORT         1
+#else
 #define SNDRV_AUTO_PORT         0xffff
+#endif
 #define SNDRV_AUTO_IRQ          0xffff
 #define SNDRV_AUTO_DMA          0xffff
@@ -75 +78 @@
 #define SNDRV_DEFAULT_ENABLE    { 1,1,1,1,1,1,1,1 }
 #define SNDRV_DEFAULT_ENABLE_PNP        SNDRV_DEFAULT_ENABLE
+#ifdef CONFIG_PNP
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
+#else
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
+#endif
 #define SNDRV_DEFAULT_PORT      { REPEAT_SNDRV(-1) }
 #define SNDRV_DEFAULT_IRQ       { REPEAT_SNDRV(SNDRV_AUTO_IRQ) }
@@ -83 +91 @@
 #define SNDDRV_DEFAULT_PCM_SUBSTREAMS {REPEAT_SNDRV(8)};
 #define SNDDRV_DEFAULT_MIDI_DEVS      {REPEAT_SNDRV(4)};
-#else
-#define SNDRV_DEFAULT_IDX       { [0 ... (SNDRV_CARDS-1)] = -1 }
-#define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
-#define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
-#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
-#define SNDRV_DEFAULT_PORT      { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
-#define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
-#define SNDRV_DEFAULT_DMA       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
-#define SNDRV_DEFAULT_DMA_SIZE  { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
-#define SNDRV_DEFAULT_PTR       SNDRV_DEFAULT_STR
-#endif
-
-#ifdef CONFIG_PNP
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
-#else
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
-#endif
 
 #define SNDRV_BOOLEAN_TRUE_DESC "allows:{{0,Disabled},{1,Enabled}},default:1,dialog:check"
@@ -119 +110 @@
 #define SNDRV_PORT12_DESC       SNDRV_ENABLED ",allows:{{0,0x3fff}},base:16"
 #define SNDRV_PORT_DESC         SNDRV_ENABLED ",allows:{{0,0xffff}},base:16"
+#else
+#define SNDRV_DEFAULT_IDX       { [0 ... (SNDRV_CARDS-1)] = -1 }
+#define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
+#define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
+#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
+#ifdef CONFIG_PNP
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
+#else
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
+#endif
+#define SNDRV_DEFAULT_PORT      { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_PORT }
+#define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
+#define SNDRV_DEFAULT_DMA       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
+#define SNDRV_DEFAULT_DMA_SIZE  { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
+#define SNDRV_DEFAULT_PTR       SNDRV_DEFAULT_STR
+#endif
 
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
@@ -157 +164 @@
 #endif
 
+#ifdef TARGET_OS2
 #if defined(SNDRV_GET_ID) && !defined(MODULE)
 #include <linux/ctype.h>
@@ -182 +190 @@
 }
 #endif
+#endif
 
-#endif                          /* __INITVAL_H */
+#endif /* __SOUND_INITVAL_H */
+

GPL/trunk/alsa-kernel/include/sound/opl3.h

@@ -18 +18 @@
  *
  *      With the above exceptions the both sides can be operated independently.
- *      
+ *
  *      A 4 OP voice can be created by setting the corresponding
  *      bit at offset 4 of the right side.
@@ -27 +27 @@
  *
  *      If a voice is set to the 2 OP mode, it works like 2 OP modes
- *      of the original YM3812 (AdLib). In addition the voice can 
+ *      of the original YM3812 (AdLib). In addition the voice can
  *      be connected the left, right or both stereo channels. It can
  *      even be left unconnected. This works with 4 OP voices also.
@@ -189 +189 @@
  *
  *
- *                                      
+ *
  *                                       +---+
  *                                       |   |
@@ -195 +195 @@
  *                                                |->
  *                                      >--3----4-+
- *                                      
+ *
  *                                       +---+
  *                                       |   |
@@ -251 +251 @@
         unsigned char sustain_release;
         unsigned char wave_select;
-#ifndef TARGET_OS2
 } __attribute__((packed));
-#else
-};
+#ifdef TARGET_OS2
 #pragma pack()
 #endif
@@ -343 +341 @@
         struct snd_midi_channel_set * oss_chset;
 #endif
- 
+
 #define OPL3_PATCH_HASH_SIZE    32
         struct fm_patch *patch_table[OPL3_PATCH_HASH_SIZE];

GPL/trunk/alsa-kernel/include/sound/pcm.h

@@ -74 +74 @@
                     snd_pcm_uframes_t pos,
                     void __user *buf, snd_pcm_uframes_t count);
-        int (*silence)(struct snd_pcm_substream *substream, int channel, 
+        int (*silence)(struct snd_pcm_substream *substream, int channel,
                        snd_pcm_uframes_t pos, snd_pcm_uframes_t count);
         struct page *(*page)(struct snd_pcm_substream *substream,
@@ -216 +216 @@
 
 struct snd_pcm_hw_constraints {
-        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+        struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
                          SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
         struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
@@ -330 +330 @@
         int tstamp_type;                /* timestamp type */
 
-        /* -- DMA -- */           
+        /* -- DMA -- */
         unsigned char *dma_area;        /* DMA area */
         dma_addr_t dma_addr;            /* physical bus address (not accessible from main CPU) */
@@ -538 +538 @@
 } while (0)
 
+#ifdef TARGET_OS2
 #define snd_pcm_group_for_each_entry(s, substream) \
         list_for_each_entry(s, &substream->group->substreams, link_list, struct snd_pcm_substream)
+#else   
+#define snd_pcm_group_for_each_entry(s, substream) \
+        list_for_each_entry(s, &substream->group->substreams, link_list)
+#endif
 
 static inline int snd_pcm_running(struct snd_pcm_substream *substream)
@@ -592 +597 @@
         snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
 #if defined TARGET_OS2
-       if ( runtime->buffer_size > runtime->control->appl_ptr) 
-          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr; 
-       else 
-       { 
- 
-          avail = runtime->control->appl_ptr - runtime->status->hw_ptr; 
-          if ( avail > runtime->buffer_size ) 
-             avail = 0; 
-          else 
-             avail = runtime->buffer_size - avail; 
-       } 
-#endif /* TARGET_OS2  */ 
+       if ( runtime->buffer_size > runtime->control->appl_ptr)
+          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+       else
+       {
+
+          avail = runtime->control->appl_ptr - runtime->status->hw_ptr;
+          if ( avail > runtime->buffer_size )
+             avail = 0;
+          else
+             avail = runtime->buffer_size - avail;
+       }
+#endif /* TARGET_OS2  */
         if (avail < 0)
                 avail += runtime->boundary;
@@ -706 +711 @@
 }
 
-static inline void snd_pcm_trigger_done(struct snd_pcm_substream *substream, 
+static inline void snd_pcm_trigger_done(struct snd_pcm_substream *substream,
                                         struct snd_pcm_substream *master)
 {
@@ -763 +768 @@
 void snd_interval_mul(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);
 void snd_interval_div(const struct snd_interval *a, const struct snd_interval *b, struct snd_interval *c);
-void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b, 
+void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interval *b,
                           unsigned int k, struct snd_interval *c);
 void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
@@ -788 +793 @@
                                  unsigned int min, unsigned int max);
 int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var);
-int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
                                snd_pcm_hw_param_t var,
                                struct snd_pcm_hw_constraint_list *l);
-int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime,
                                   unsigned int cond,
                                   snd_pcm_hw_param_t var,
                                   struct snd_pcm_hw_constraint_ratnums *r);
-int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime,
                                   unsigned int cond,
                                   snd_pcm_hw_param_t var,
                                   struct snd_pcm_hw_constraint_ratdens *r);
-int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime, 
+int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime,
                                  unsigned int cond,
                                  unsigned int width,
@@ -848 +853 @@
 int snd_pcm_lib_interleave_len(struct snd_pcm_substream *substream);
 int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
-                      unsigned int cmd, void *arg);                      
+                      unsigned int cmd, void *arg);
 int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream);
 int snd_pcm_playback_xrun_check(struct snd_pcm_substream *substream);

GPL/trunk/alsa-kernel/include/sound/seq_kernel.h

@@ -76 +76 @@
 
 /* interface for kernel client */
-#ifndef TARGET_OS2
 int snd_seq_create_kernel_client(struct snd_card *card, int client_index,
                                  const char *name_fmt, ...)
         __attribute__ ((format (printf, 3, 4)));
-#else
-int snd_seq_create_kernel_client(struct snd_card *card, int client_index,
-                                 const char *name_fmt, ...);
-#endif
 int snd_seq_delete_kernel_client(int client);
 int snd_seq_kernel_client_enqueue(int client, struct snd_seq_event *ev, int atomic, int hop);