Changeset 73 for GPL/trunk/alsa-kernel

Timestamp:

Jan 14, 2006, 11:32:17 PM (20 years ago)

Author:

vladest

Message:

Fixed compile issues
Fixed SB128 driver

Location:

GPL/trunk/alsa-kernel

Files:

• core/memory.c (modified) (2 diffs)
• include/sound/driver.h (modified) (2 diffs)
• pci/ens1370.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/core/memory.c

@@ -186 +186 @@
 }
 
-char *snd_hidden_kstrdup(const char *s, int flags)
-{
-    int len;
-    char *buf;
-
-    if (!s) return NULL;
-
-    len = strlen(s) + 1;
-    buf = _snd_kmalloc(len, flags);
-    if (buf)
-        memcpy(buf, s, len);
-    return buf;
-}
-
 static void snd_memory_info_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer)
 {
@@ -321 +307 @@
 }
 
+char *snd_hidden_kstrdup(const char *s, int flags)
+{
+    int len;
+    char *buf;
+
+    if (!s) return NULL;
+
+    len = strlen(s) + 1;
+    buf = _snd_kmalloc(len, flags);
+    if (buf)
+        memcpy(buf, s, len);
+    return buf;
+}
+
 void *kzalloc(size_t size, unsigned int flags)
 {

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

@@ -532 +532 @@
 #define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
 #endif
+
+char *snd_hidden_kstrdup(const char *s, int flags);
+#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
+
 char *snd_kmalloc_strdup(const char *string, int flags);
 int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
@@ -741 +745 @@
 #endif
 
+#define printk_ratelimit()      1
+
 typedef unsigned gfp_t;
 
-char *kstrdup(const char *s, gfp_t gfp_flags);
-
 #endif                          /* __DRIVER_H */

GPL/trunk/alsa-kernel/pci/ens1370.c

@@ -1134 +1134 @@
                                    &snd_es1370_hw_constraints_rates);
 #else
-        snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                      &snd_es1371_hw_constraints_dac_clock);
+//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+//                                    &snd_es1371_hw_constraints_dac_clock);
 #endif
         return 0;
@@ -1157 +1157 @@
                                       &snd_es1370_hw_constraints_clock);
 #else
-        snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                      &snd_es1371_hw_constraints_dac_clock);
+//      snd_pcm_hw_constraint_ratdens(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+//                                    &snd_es1371_hw_constraints_dac_clock);
 #endif
         return 0;