Changeset 206 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

Jun 17, 2007, 1:16:58 AM (18 years ago)

Author:

Brendan Oakley

Message:

Applied fixes from trunk to ReSync branch, fixed up additional conflicts, errors, and warnings.

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• compat_22.h (modified) (2 diffs)
• core.h (modified) (6 diffs)
• emu10k1.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

@@ -444 +444 @@
 #define up_write(x) up(x)
 
-/* this is identical with tq_struct but the "routine" field is renamed to "func" */
-struct tasklet_struct {
-        struct tasklet_struct *next;    /* linked list of active bh's */
-        unsigned long sync;             /* must be initialized to zero */
-        void (*func)(void *);           /* function to call */
-        void *data;                     /* argument to function */
-};
-
-#define tasklet_init(t,f,d)     do { \
-        (t)->next = NULL; \
-        (t)->sync = 0; \
-        (t)->func = (void (*)(void *))(f); \
-        (t)->data = (void *)(d); \
-} while (0)
-
 #define tasklet_unlock_wait(t)  while (test_bit(0, &(t)->sync)) { }
 #define tasklet_kill(t)         tasklet_unlock_wait(t) /* FIXME: world is not perfect... */
@@ -469 +454 @@
 #define __user
 #endif
-
-#include <asm/atomic.h>
-#define ATOMIC_INIT(i)  { (i) }
-/**
- * atomic_dec_and_test - decrement and test
- * @v: pointer of type atomic_t
- *
- * Atomically decrements @v by 1 and
- * returns true if the result is 0, or false for all other
- * cases.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_dec_and_test(volatile atomic_t *v)
-{
-    atomic_dec(v);
-    if (v->counter == 0)
-        return 1;
-    return 0;
-}
 
 /**

GPL/branches/alsa-resync1/alsa-kernel/include/sound/core.h

@@ -25 +25 @@
 #include <linux/sched.h>                /* wake_up() */
 #include <asm/semaphore.h>
+#include <sound/typedefs.h>
 
 /* Typedef's */
@@ -138 +139 @@
         struct device *dev;
 #ifdef CONFIG_PM
-        int (*pm_suspend)(struct snd_card *card, unsigned int state);
-        int (*pm_resume)(struct snd_card *card, unsigned int state);
-        struct pm_dev *pm_dev;          /* for ISA */
+        int (*pm_suspend)(struct snd_card *card, unsigned int state);
+        int (*pm_resume)(struct snd_card *card, unsigned int state);
+        struct pm_dev *pm_dev;          /* for ISA */
         void *pm_private_data;
         unsigned int power_state;       /* power state */
@@ -176 +177 @@
         wake_up(&card->power_sleep);
 }
-int snd_card_set_pm_callback(struct snd_card *card,
-                             int (*suspend)(struct snd_card *, unsigned int),
-                             int (*resume)(struct snd_card *, unsigned int),
+int snd_card_set_pm_callback(snd_card_t *card,
+                             int (*suspend)(snd_card_t *, unsigned int),
+                             int (*resume)(snd_card_t *, unsigned int),
                              void *private_data);
 int snd_card_set_isa_pm_callback(struct snd_card *card,
@@ -293 +294 @@
 struct snd_card *snd_card_new(int idx, const char *id,
                          struct module *module, int extra_size);
+int snd_card_disconnect(struct snd_card *card);
 int snd_card_free(struct snd_card *card);
 int snd_card_register(struct snd_card *card);
@@ -307 +309 @@
 int snd_device_register(struct snd_card *card, void *device_data);
 int snd_device_register_all(struct snd_card *card);
+int snd_device_disconnect_all(struct snd_card *card);
 int snd_device_free(struct snd_card *card, void *device_data);
 int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd);
@@ -314 +317 @@
 #define DMA_MODE_NO_ENABLE      0x0100
 
-void snd_dma_program(unsigned long dma, unsigned long addr, unsigned int size, unsigned short mode);
+void snd_dma_program(unsigned long dma, const void *buf, unsigned int size, unsigned short mode);
 void snd_dma_disable(unsigned long dma);
 unsigned int snd_dma_residue(unsigned long dma);

GPL/branches/alsa-resync1/alsa-kernel/include/sound/emu10k1.h

@@ -1520 +1520 @@
 int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct snd_hwdep ** rhwdep);
 
-irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id);
+irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *);
 
 void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int voice);