Merge branch 'topic/misc' into for-linus

1 files changed, 64 insertions, 0 deletions

diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
new file mode 100644
index 000000000000..6229022f56cb
--- /dev/null
+++ b/sound/pci/asihpi/hpicmn.h
@@ -0,0 +1,64 @@
+/**
+
+    AudioScience HPI driver
+    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of version 2 of the GNU General Public License as
+    published by the Free Software Foundation;
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+struct hpi_adapter_obj {
+        struct hpi_pci pci;     /* PCI info - bus#,dev#,address etc */
+        u16 adapter_type;       /* ASI6701 etc */
+        u16 index;              /* */
+        u16 open;               /* =1 when adapter open */
+        u16 mixer_open;
+
+        struct hpios_spinlock dsp_lock;
+
+        u16 dsp_crashed;
+        u16 has_control_cache;
+        void *priv;
+};
+
+struct hpi_control_cache {
+        u32 init;            /**< indicates whether the
+                                structures are initialized */
+        u32 control_count;
+        u32 cache_size_in_bytes;
+        struct hpi_control_cache_info
+        **p_info;                /**< pointer to allocated memory of
+                                lookup pointers. */
+        struct hpi_control_cache_single
+        *p_cache;                /**< pointer to DSP's control cache. */
+};
+
+struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index);
+u16 hpi_add_adapter(struct hpi_adapter_obj *pao);
+
+void hpi_delete_adapter(struct hpi_adapter_obj *pao);
+
+short hpi_check_control_cache(struct hpi_control_cache *pC,
+        struct hpi_message *phm, struct hpi_response *phr);
+struct hpi_control_cache *hpi_alloc_control_cache(const u32
+        number_of_controls, const u32 size_in_bytes,
+        struct hpi_control_cache_info
+        *pDSP_control_buffer);
+void hpi_free_control_cache(struct hpi_control_cache *p_cache);
+
+void hpi_sync_control_cache(struct hpi_control_cache *pC,
+        struct hpi_message *phm, struct hpi_response *phr);
+u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr);
+short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,
+        struct hpi_message *phm, void **p, unsigned int *pN);