aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-12-04 18:23:22 +0100
committerTakashi Iwai <tiwai@suse.de>2012-12-04 18:23:22 +0100
commit51bdbc8144c24d13e9c87c3fab923d9766e394e1 (patch)
tree6726488c4bfa7132d7b643ddc0c92e2568e5e781
parente20db4bd19368709d92b3b895588b3a4f83af78a (diff)
downloadhda-emu-51bdbc8144c24d13e9c87c3fab923d9766e394e1.tar.gz
Add include/linux/firmware.h (and let others build with that)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/linux/firmware.h22
-rw-r--r--include/sound/core.h3
-rw-r--r--include/sound/pcm.h15
3 files changed, 40 insertions, 0 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
new file mode 100644
index 0000000..2734dd5
--- /dev/null
+++ b/include/linux/firmware.h
@@ -0,0 +1,22 @@
+#ifndef _LINUX_FIRMWARE_H
+#define _LINUX_FIRMWARE_H
+
+#include <linux/device.h>
+
+struct firmware {
+ size_t size;
+ const u8 *data;
+};
+
+static inline int
+request_firmware(const struct firmware **fw, const char *name,
+ struct device *device)
+{
+ return -ENODEV;
+}
+
+static inline void release_firmware(const struct firmware *fw) {}
+
+#define MODULE_FIRMWARE(name)
+
+#endif
diff --git a/include/sound/core.h b/include/sound/core.h
index a749460..865efa8 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -4,6 +4,7 @@
#include "wrapper.h"
#include <linux/slab.h>
#include <linux/list.h>
+#include <linux/device.h>
enum {
SND_PR_ALWAYS,
@@ -47,6 +48,8 @@ struct snd_card {
int shutdown;
struct list_head ctl_files;
spinlock_t files_lock;
+
+ struct device *dev;
};
struct snd_device {
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 4980c69..f4f45c0 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -299,5 +299,20 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
unsigned long private_value,
struct snd_pcm_chmap **info_ret);
+/*
+ */
+struct snd_dma_device {
+ int type; /* SNDRV_DMA_TYPE_XXX */
+ struct device *dev; /* generic device */
+};
+
+struct snd_dma_buffer {
+ struct snd_dma_device dev; /* device type */
+ unsigned char *area; /* virtual pointer */
+ dma_addr_t addr; /* physical address */
+ size_t bytes; /* buffer size in bytes */
+ void *private_data; /* private for allocator; don't touch */
+};
+
#endif /* __SOUND_PCM_H */