Merge branch 'topic/misc' into for-linus

86 files changed, 9736 insertions, 6442 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index db51e4e64984..a08ad57c49b6 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -279,33 +279,31 @@ void snd_ctl_free_one(struct snd_kcontrol *kcontrol)
 
 EXPORT_SYMBOL(snd_ctl_free_one);
 
-static unsigned int snd_ctl_hole_check(struct snd_card *card,
-                                       unsigned int count)
+static bool snd_ctl_remove_numid_conflict(struct snd_card *card,
+                                          unsigned int count)
 {
         struct snd_kcontrol *kctl;
 
         list_for_each_entry(kctl, &card->controls, list) {
-                if ((kctl->id.numid <= card->last_numid &&
-                     kctl->id.numid + kctl->count > card->last_numid) ||
-                    (kctl->id.numid <= card->last_numid + count - 1 &&
-                     kctl->id.numid + kctl->count > card->last_numid + count - 1))
-                        return card->last_numid = kctl->id.numid + kctl->count - 1;
+                if (kctl->id.numid < card->last_numid + 1 + count &&
+                    kctl->id.numid + kctl->count > card->last_numid + 1) {
+                        card->last_numid = kctl->id.numid + kctl->count - 1;
+                        return true;
+                }
         }
-        return card->last_numid;
+        return false;
 }
 
 static int snd_ctl_find_hole(struct snd_card *card, unsigned int count)
 {
-        unsigned int last_numid, iter = 100000;
+        unsigned int iter = 100000;
 
-        last_numid = card->last_numid;
-        while (last_numid != snd_ctl_hole_check(card, count)) {
+        while (snd_ctl_remove_numid_conflict(card, count)) {
                 if (--iter == 0) {
                         /* this situation is very unlikely */
                         snd_printk(KERN_ERR "unable to allocate new control numid\n");
                         return -ENOMEM;
                 }
-                last_numid = card->last_numid;
         }
         return 0;
 }
diff --git a/sound/core/device.c b/sound/core/device.c
index a67dfac08c03..2d1ad4b0cd65 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -225,15 +225,16 @@ int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd)
 {
         struct snd_device *dev;
         int err;
-        unsigned int range_low, range_high;
+        unsigned int range_low, range_high, type;
 
         if (snd_BUG_ON(!card))
                 return -ENXIO;
-        range_low = cmd * SNDRV_DEV_TYPE_RANGE_SIZE;
+        range_low = (__force unsigned int)cmd * SNDRV_DEV_TYPE_RANGE_SIZE;
         range_high = range_low + SNDRV_DEV_TYPE_RANGE_SIZE - 1;
       __again:
         list_for_each_entry(dev, &card->devices, list) {
-                if (dev->type >= range_low && dev->type <= range_high) {
+                type = (__force unsigned int)dev->type;
+                if (type >= range_low && type <= range_high) {
                         if ((err = snd_device_free(card, dev->device_data)) < 0)
                                 return err;
                         goto __again;
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 9e92441f9b78..16bd9c03679b 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -192,7 +192,8 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
         dmab->bytes = 0;
         switch (type) {
         case SNDRV_DMA_TYPE_CONTINUOUS:
-                dmab->area = snd_malloc_pages(size, (unsigned long)device);
+                dmab->area = snd_malloc_pages(size,
+                                        (__force gfp_t)(unsigned long)device);
                 dmab->addr = 0;
                 break;
 #ifdef CONFIG_HAS_DMA
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 4c1d16827199..13b3f6f49fae 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -114,7 +114,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
         return frames;
 }
 
-static void init_data(struct linear_priv *data, int src_format, int dst_format)
+static void init_data(struct linear_priv *data,
+                      snd_pcm_format_t src_format, snd_pcm_format_t dst_format)
 {
         int src_le, dst_le, src_bytes, dst_bytes;
 
@@ -140,9 +141,9 @@ static void init_data(struct linear_priv *data, int src_format, int dst_format)
         if (snd_pcm_format_signed(src_format) !=
             snd_pcm_format_signed(dst_format)) {
                 if (dst_le)
-                        data->flip = cpu_to_le32(0x80000000);
+                        data->flip = (__force u32)cpu_to_le32(0x80000000);
                 else
-                        data->flip = cpu_to_be32(0x80000000);
+                        data->flip = (__force u32)cpu_to_be32(0x80000000);
         }
 }
 
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 822dd56993ca..d8359cfeca15 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -190,9 +190,10 @@ static int snd_mixer_oss_get_recsrc(struct snd_mixer_oss_file *fmixer)
                 return -EIO;
         if (mixer->put_recsrc && mixer->get_recsrc) {   /* exclusive */
                 int err;
-                if ((err = mixer->get_recsrc(fmixer, &result)) < 0)
+                unsigned int index;
+                if ((err = mixer->get_recsrc(fmixer, &index)) < 0)
                         return err;
-                result = 1 << result;
+                result = 1 << index;
         } else {
                 struct snd_mixer_oss_slot *pslot;
                 int chn;
@@ -214,6 +215,7 @@ static int snd_mixer_oss_set_recsrc(struct snd_mixer_oss_file *fmixer, int recsr
         struct snd_mixer_oss *mixer = fmixer->mixer;
         struct snd_mixer_oss_slot *pslot;
         int chn, active;
+        unsigned int index;
         int result = 0;
 
         if (mixer == NULL)
@@ -222,8 +224,8 @@ static int snd_mixer_oss_set_recsrc(struct snd_mixer_oss_file *fmixer, int recsr
                 if (recsrc & ~mixer->oss_recsrc)
                         recsrc &= ~mixer->oss_recsrc;
                 mixer->put_recsrc(fmixer, ffz(~recsrc));
-                mixer->get_recsrc(fmixer, &result);
-                result = 1 << result;
+                mixer->get_recsrc(fmixer, &index);
+                result = 1 << index;
         }
         for (chn = 0; chn < 31; chn++) {
                 pslot = &mixer->slots[chn];
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c
index f7649d4d950b..7915564bd394 100644
--- a/sound/core/oss/mulaw.c
+++ b/sound/core/oss/mulaw.c
@@ -274,7 +274,7 @@ static snd_pcm_sframes_t mulaw_transfer(struct snd_pcm_plugin *plugin,
         return frames;
 }
 
-static void init_data(struct mulaw_priv *data, int format)
+static void init_data(struct mulaw_priv *data, snd_pcm_format_t format)
 {
 #ifdef SNDRV_LITTLE_ENDIAN
         data->cvt_endian = snd_pcm_format_big_endian(format) > 0;
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index a2e4eb324699..23c34a02894b 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -41,6 +41,7 @@
 #include <sound/info.h>
 #include <linux/soundcard.h>
 #include <sound/initval.h>
+#include <sound/mixer_oss.h>
 
 #define OSS_ALSAEMULVER         _SIOR ('M', 249, int)
 
@@ -60,7 +61,6 @@ MODULE_PARM_DESC(nonblock_open, "Don't block opening busy PCM devices.");
 MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM);
 MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM1);
 
-extern int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned long arg);
 static int snd_pcm_oss_get_rate(struct snd_pcm_oss_file *pcm_oss_file);
 static int snd_pcm_oss_get_channels(struct snd_pcm_oss_file *pcm_oss_file);
 static int snd_pcm_oss_get_format(struct snd_pcm_oss_file *pcm_oss_file);
@@ -656,7 +656,7 @@ snd_pcm_uframes_t get_hw_ptr_period(struct snd_pcm_runtime *runtime)
 #define AFMT_AC3         0x00000400
 #define AFMT_VORBIS      0x00000800
 
-static int snd_pcm_oss_format_from(int format)
+static snd_pcm_format_t snd_pcm_oss_format_from(int format)
 {
         switch (format) {
         case AFMT_MU_LAW:       return SNDRV_PCM_FORMAT_MU_LAW;
@@ -680,7 +680,7 @@ static int snd_pcm_oss_format_from(int format)
         }
 }
 
-static int snd_pcm_oss_format_to(int format)
+static int snd_pcm_oss_format_to(snd_pcm_format_t format)
 {
         switch (format) {
         case SNDRV_PCM_FORMAT_MU_LAW:   return AFMT_MU_LAW;
@@ -843,7 +843,8 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
         size_t oss_frame_size;
         int err;
         int direct;
-        int format, sformat, n;
+        snd_pcm_format_t format, sformat;
+        int n;
         struct snd_mask sformat_mask;
         struct snd_mask mask;
 
@@ -868,11 +869,11 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
         _snd_pcm_hw_param_min(sparams, SNDRV_PCM_HW_PARAM_PERIODS, 2, 0);
         snd_mask_none(&mask);
         if (atomic_read(&substream->mmap_count))
-                snd_mask_set(&mask, SNDRV_PCM_ACCESS_MMAP_INTERLEAVED);
+                snd_mask_set(&mask, (__force int)SNDRV_PCM_ACCESS_MMAP_INTERLEAVED);
         else {
-                snd_mask_set(&mask, SNDRV_PCM_ACCESS_RW_INTERLEAVED);
+                snd_mask_set(&mask, (__force int)SNDRV_PCM_ACCESS_RW_INTERLEAVED);
                 if (!direct)
-                        snd_mask_set(&mask, SNDRV_PCM_ACCESS_RW_NONINTERLEAVED);
+                        snd_mask_set(&mask, (__force int)SNDRV_PCM_ACCESS_RW_NONINTERLEAVED);
         }
         err = snd_pcm_hw_param_mask(substream, sparams, SNDRV_PCM_HW_PARAM_ACCESS, &mask);
         if (err < 0) {
@@ -891,19 +892,22 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
         else
                 sformat = snd_pcm_plug_slave_format(format, &sformat_mask);
 
-        if (sformat < 0 || !snd_mask_test(&sformat_mask, sformat)) {
-                for (sformat = 0; sformat <= SNDRV_PCM_FORMAT_LAST; sformat++) {
-                        if (snd_mask_test(&sformat_mask, sformat) &&
+        if ((__force int)sformat < 0 ||
+            !snd_mask_test(&sformat_mask, (__force int)sformat)) {
+                for (sformat = (__force snd_pcm_format_t)0;
+                     (__force int)sformat <= (__force int)SNDRV_PCM_FORMAT_LAST;
+                     sformat = (__force snd_pcm_format_t)((__force int)sformat + 1)) {
+                        if (snd_mask_test(&sformat_mask, (__force int)sformat) &&
                             snd_pcm_oss_format_to(sformat) >= 0)
                                 break;
                 }
-                if (sformat > SNDRV_PCM_FORMAT_LAST) {
+                if ((__force int)sformat > (__force int)SNDRV_PCM_FORMAT_LAST) {
                         snd_printd("Cannot find a format!!!\n");
                         err = -EINVAL;
                         goto failure;
                 }
         }
-        err = _snd_pcm_hw_param_set(sparams, SNDRV_PCM_HW_PARAM_FORMAT, sformat, 0);
+        err = _snd_pcm_hw_param_set(sparams, SNDRV_PCM_HW_PARAM_FORMAT, (__force int)sformat, 0);
         if (err < 0)
                 goto failure;
 
@@ -912,9 +916,9 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
         } else {
                 _snd_pcm_hw_params_any(params);
                 _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_ACCESS,
-                                      SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);
+                                      (__force int)SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);
                 _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_FORMAT,
-                                      snd_pcm_oss_format_from(runtime->oss.format), 0);
+                                      (__force int)snd_pcm_oss_format_from(runtime->oss.format), 0);
                 _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_CHANNELS,
                                       runtime->oss.channels, 0);
                 _snd_pcm_hw_param_set(params, SNDRV_PCM_HW_PARAM_RATE,
@@ -1185,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
                 if (in_kernel) {
                         mm_segment_t fs;
                         fs = snd_enter_user();
-                        ret = snd_pcm_lib_write(substream, (void __user *)ptr, frames);
+                        ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
                         snd_leave_user(fs);
                 } else {
-                        ret = snd_pcm_lib_write(substream, (void __user *)ptr, frames);
+                        ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
                 }
                 if (ret != -EPIPE && ret != -ESTRPIPE)
                         break;
@@ -1230,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
                 if (in_kernel) {
                         mm_segment_t fs;
                         fs = snd_enter_user();
-                        ret = snd_pcm_lib_read(substream, (void __user *)ptr, frames);
+                        ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
                         snd_leave_user(fs);
                 } else {
-                        ret = snd_pcm_lib_read(substream, (void __user *)ptr, frames);
+                        ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
                 }
                 if (ret == -EPIPE) {
                         if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
@@ -1333,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
                 struct snd_pcm_plugin_channel *channels;
                 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
                 if (!in_kernel) {
-                        if (copy_from_user(runtime->oss.buffer, (const char __user *)buf, bytes))
+                        if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
                                 return -EFAULT;
                         buf = runtime->oss.buffer;
                 }
@@ -1429,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
         struct snd_pcm_runtime *runtime = substream->runtime;
         snd_pcm_sframes_t frames, frames1;
 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
-        char __user *final_dst = (char __user *)buf;
+        char __user *final_dst = (char __force __user *)buf;
         if (runtime->oss.plugin_first) {
                 struct snd_pcm_plugin_channel *channels;
                 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
@@ -1549,6 +1553,7 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)
 {
         struct snd_pcm_runtime *runtime;
         ssize_t result = 0;
+        snd_pcm_state_t state;
         long res;
         wait_queue_t wait;
 
@@ -1570,9 +1575,9 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size)
                 result = 0;
                 set_current_state(TASK_INTERRUPTIBLE);
                 snd_pcm_stream_lock_irq(substream);
-                res = runtime->status->state;
+                state = runtime->status->state;
                 snd_pcm_stream_unlock_irq(substream);
-                if (res != SNDRV_PCM_STATE_RUNNING) {
+                if (state != SNDRV_PCM_STATE_RUNNING) {
                         set_current_state(TASK_RUNNING);
                         break;
                 }
@@ -1658,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
                                                                    size1);
                                         size1 /= runtime->channels; /* frames */
                                         fs = snd_enter_user();
-                                        snd_pcm_lib_write(substream, (void __user *)runtime->oss.buffer, size1);
+                                        snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
                                         snd_leave_user(fs);
                                 }
                         } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 6751daa3bb50..71cc3ddf5c15 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -264,7 +264,7 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pc
         return frames;
 }
 
-static int snd_pcm_plug_formats(struct snd_mask *mask, int format)
+static int snd_pcm_plug_formats(struct snd_mask *mask, snd_pcm_format_t format)
 {
         struct snd_mask formats = *mask;
         u64 linfmts = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
@@ -276,16 +276,16 @@ static int snd_pcm_plug_formats(struct snd_mask *mask, int format)
                        SNDRV_PCM_FMTBIT_U24_3BE | SNDRV_PCM_FMTBIT_S24_3BE |
                        SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |
                        SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE);
-        snd_mask_set(&formats, SNDRV_PCM_FORMAT_MU_LAW);
+        snd_mask_set(&formats, (__force int)SNDRV_PCM_FORMAT_MU_LAW);
         
         if (formats.bits[0] & (u32)linfmts)
                 formats.bits[0] |= (u32)linfmts;
         if (formats.bits[1] & (u32)(linfmts >> 32))
                 formats.bits[1] |= (u32)(linfmts >> 32);
-        return snd_mask_test(&formats, format);
+        return snd_mask_test(&formats, (__force int)format);
 }
 
-static int preferred_formats[] = {
+static snd_pcm_format_t preferred_formats[] = {
         SNDRV_PCM_FORMAT_S16_LE,
         SNDRV_PCM_FORMAT_S16_BE,
         SNDRV_PCM_FORMAT_U16_LE,
@@ -306,24 +306,25 @@ static int preferred_formats[] = {
         SNDRV_PCM_FORMAT_U8
 };
 
-int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask)
+snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format,
+                                           struct snd_mask *format_mask)
 {
         int i;
 
-        if (snd_mask_test(format_mask, format))
+        if (snd_mask_test(format_mask, (__force int)format))
                 return format;
-        if (! snd_pcm_plug_formats(format_mask, format))
-                return -EINVAL;
+        if (!snd_pcm_plug_formats(format_mask, format))
+                return (__force snd_pcm_format_t)-EINVAL;
         if (snd_pcm_format_linear(format)) {
                 unsigned int width = snd_pcm_format_width(format);
                 int unsignd = snd_pcm_format_unsigned(format) > 0;
                 int big = snd_pcm_format_big_endian(format) > 0;
                 unsigned int badness, best = -1;
-                int best_format = -1;
+                snd_pcm_format_t best_format = (__force snd_pcm_format_t)-1;
                 for (i = 0; i < ARRAY_SIZE(preferred_formats); i++) {
-                        int f = preferred_formats[i];
+                        snd_pcm_format_t f = preferred_formats[i];
                         unsigned int w;
-                        if (!snd_mask_test(format_mask, f))
+                        if (!snd_mask_test(format_mask, (__force int)f))
                                 continue;
                         w = snd_pcm_format_width(f);
                         if (w >= width)
@@ -337,17 +338,20 @@ int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask)
                                 best = badness;
                         }
                 }
-                return best_format >= 0 ? best_format : -EINVAL;
+                if ((__force int)best_format >= 0)
+                        return best_format;
+                else
+                        return (__force snd_pcm_format_t)-EINVAL;
         } else {
                 switch (format) {
                 case SNDRV_PCM_FORMAT_MU_LAW:
                         for (i = 0; i < ARRAY_SIZE(preferred_formats); ++i) {
-                                int format1 = preferred_formats[i];
-                                if (snd_mask_test(format_mask, format1))
+                                snd_pcm_format_t format1 = preferred_formats[i];
+                                if (snd_mask_test(format_mask, (__force int)format1))
                                         return format1;
                         }
                 default:
-                        return -EINVAL;
+                        return (__force snd_pcm_format_t)-EINVAL;
                 }
         }
 }
@@ -359,7 +363,7 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug,
         struct snd_pcm_plugin_format tmpformat;
         struct snd_pcm_plugin_format dstformat;
         struct snd_pcm_plugin_format srcformat;
-        int src_access, dst_access;
+        snd_pcm_access_t src_access, dst_access;
         struct snd_pcm_plugin *plugin = NULL;
         int err;
         int stream = snd_pcm_plug_stream(plug);
@@ -641,7 +645,7 @@ snd_pcm_sframes_t snd_pcm_plug_read_transfer(struct snd_pcm_substream *plug, str
 }
 
 int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_area, size_t dst_offset,
-                         size_t samples, int format)
+                         size_t samples, snd_pcm_format_t format)
 {
         /* FIXME: sub byte resolution and odd dst_offset */
         unsigned char *dst;
@@ -688,7 +692,7 @@ int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_area, size_t dst
 
 int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_area, size_t src_offset,
                       const struct snd_pcm_channel_area *dst_area, size_t dst_offset,
-                      size_t samples, int format)
+                      size_t samples, snd_pcm_format_t format)
 {
         /* FIXME: sub byte resolution and odd dst_offset */
         char *src, *dst;
diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h
index b9afab603711..a5035c2369a6 100644
--- a/sound/core/oss/pcm_plugin.h
+++ b/sound/core/oss/pcm_plugin.h
@@ -46,7 +46,7 @@ struct snd_pcm_plugin_channel {
 };
 
 struct snd_pcm_plugin_format {
-        int format;
+        snd_pcm_format_t format;
         unsigned int rate;
         unsigned int channels;
 };
@@ -58,7 +58,7 @@ struct snd_pcm_plugin {
         struct snd_pcm_plugin_format dst_format;        /* destination format */
         int src_width;                  /* sample width in bits */
         int dst_width;                  /* sample width in bits */
-        int access;
+        snd_pcm_access_t access;
         snd_pcm_sframes_t (*src_frames)(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t dst_frames);
         snd_pcm_sframes_t (*dst_frames)(struct snd_pcm_plugin *plugin, snd_pcm_uframes_t src_frames);
         snd_pcm_sframes_t (*client_channels)(struct snd_pcm_plugin *plugin,
@@ -125,7 +125,8 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params,
                                 struct snd_pcm_hw_params *slave_params);
 
-int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask);
+snd_pcm_format_t snd_pcm_plug_slave_format(snd_pcm_format_t format,
+                                           struct snd_mask *format_mask);
 
 int snd_pcm_plugin_append(struct snd_pcm_plugin *plugin);
 
@@ -146,12 +147,12 @@ snd_pcm_sframes_t snd_pcm_plugin_client_channels(struct snd_pcm_plugin *plugin,
 
 int snd_pcm_area_silence(const struct snd_pcm_channel_area *dst_channel,
                          size_t dst_offset,
-                         size_t samples, int format);
+                         size_t samples, snd_pcm_format_t format);
 int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_channel,
                       size_t src_offset,
                       const struct snd_pcm_channel_area *dst_channel,
                       size_t dst_offset,
-                      size_t samples, int format);
+                      size_t samples, snd_pcm_format_t format);
 
 void *snd_pcm_plug_buf_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t size);
 void snd_pcm_plug_buf_unlock(struct snd_pcm_substream *plug, void *ptr);
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index bbe25d8c450a..c8171f5783c8 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -25,7 +25,7 @@
 #include "pcm_plugin.h"
 
 static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,
-                       snd_pcm_uframes_t frames, int format)
+                       snd_pcm_uframes_t frames, snd_pcm_format_t format)
 {
         int dst = 0;
         for (; dst < ndsts; ++dst) {
@@ -38,7 +38,7 @@ static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,
 
 static inline void copy_area(const struct snd_pcm_plugin_channel *src_channel,
                              struct snd_pcm_plugin_channel *dst_channel,
-                             snd_pcm_uframes_t frames, int format)
+                             snd_pcm_uframes_t frames, snd_pcm_format_t format)
 {
         dst_channel->enabled = 1;
         snd_pcm_area_copy(&src_channel->area, 0, &dst_channel->area, 0, frames, format);
@@ -51,7 +51,7 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin,
 {
         int nsrcs, ndsts, dst;
         struct snd_pcm_plugin_channel *dvp;
-        int format;
+        snd_pcm_format_t format;
 
         if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
                 return -ENXIO;
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 6b4b1287b314..ee9abb2d9001 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -211,9 +211,9 @@ static char *snd_pcm_format_names[] = {
 
 const char *snd_pcm_format_name(snd_pcm_format_t format)
 {
-        if (format >= ARRAY_SIZE(snd_pcm_format_names))
+        if ((__force unsigned int)format >= ARRAY_SIZE(snd_pcm_format_names))
                 return "Unknown";
-        return snd_pcm_format_names[format];
+        return snd_pcm_format_names[(__force unsigned int)format];
 }
 EXPORT_SYMBOL_GPL(snd_pcm_format_name);
 
@@ -269,12 +269,12 @@ static const char *snd_pcm_stream_name(int stream)
 
 static const char *snd_pcm_access_name(snd_pcm_access_t access)
 {
-        return snd_pcm_access_names[access];
+        return snd_pcm_access_names[(__force int)access];
 }
 
 static const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat)
 {
-        return snd_pcm_subformat_names[subformat];
+        return snd_pcm_subformat_names[(__force int)subformat];
 }
 
 static const char *snd_pcm_tstamp_mode_name(int mode)
@@ -284,7 +284,7 @@ static const char *snd_pcm_tstamp_mode_name(int mode)
 
 static const char *snd_pcm_state_name(snd_pcm_state_t state)
 {
-        return snd_pcm_state_names[state];
+        return snd_pcm_state_names[(__force int)state];
 }
 
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 434af3c56d52..88f02e3866e0 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -35,7 +35,10 @@ struct pcm_format_data {
         unsigned char silence[8];       /* silence data to fill */
 };
 
-static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {
+/* we do lots of calculations on snd_pcm_format_t; shut up sparse */
+#define INT     __force int
+
+static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = {
         [SNDRV_PCM_FORMAT_S8] = {
                 .width = 8, .phys = 8, .le = -1, .signd = 1,
                 .silence = {},
@@ -215,9 +218,9 @@ static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {
 int snd_pcm_format_signed(snd_pcm_format_t format)
 {
         int val;
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return -EINVAL;
-        if ((val = pcm_formats[format].signd) < 0)
+        if ((val = pcm_formats[(INT)format].signd) < 0)
                 return -EINVAL;
         return val;
 }
@@ -266,9 +269,9 @@ EXPORT_SYMBOL(snd_pcm_format_linear);
 int snd_pcm_format_little_endian(snd_pcm_format_t format)
 {
         int val;
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return -EINVAL;
-        if ((val = pcm_formats[format].le) < 0)
+        if ((val = pcm_formats[(INT)format].le) < 0)
                 return -EINVAL;
         return val;
 }
@@ -304,9 +307,9 @@ EXPORT_SYMBOL(snd_pcm_format_big_endian);
 int snd_pcm_format_width(snd_pcm_format_t format)
 {
         int val;
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return -EINVAL;
-        if ((val = pcm_formats[format].width) == 0)
+        if ((val = pcm_formats[(INT)format].width) == 0)
                 return -EINVAL;
         return val;
 }
@@ -323,9 +326,9 @@ EXPORT_SYMBOL(snd_pcm_format_width);
 int snd_pcm_format_physical_width(snd_pcm_format_t format)
 {
         int val;
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return -EINVAL;
-        if ((val = pcm_formats[format].phys) == 0)
+        if ((val = pcm_formats[(INT)format].phys) == 0)
                 return -EINVAL;
         return val;
 }
@@ -358,11 +361,11 @@ EXPORT_SYMBOL(snd_pcm_format_size);
  */
 const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format)
 {
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return NULL;
-        if (! pcm_formats[format].phys)
+        if (! pcm_formats[(INT)format].phys)
                 return NULL;
-        return pcm_formats[format].silence;
+        return pcm_formats[(INT)format].silence;
 }
 
 EXPORT_SYMBOL(snd_pcm_format_silence_64);
@@ -382,16 +385,16 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
         int width;
         unsigned char *dst, *pat;
 
-        if (format < 0 || format > SNDRV_PCM_FORMAT_LAST)
+        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                 return -EINVAL;
         if (samples == 0)
                 return 0;
-        width = pcm_formats[format].phys; /* physical width */
-        pat = pcm_formats[format].silence;
+        width = pcm_formats[(INT)format].phys; /* physical width */
+        pat = pcm_formats[(INT)format].silence;
         if (! width)
                 return -EINVAL;
         /* signed or 1 byte data */
-        if (pcm_formats[format].signd == 1 || width <= 8) {
+        if (pcm_formats[(INT)format].signd == 1 || width <= 8) {
                 unsigned int bytes = samples * width / 8;
                 memset(data, *pat, bytes);
                 return 0;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 4be45e7be8ad..ae42b6509ce4 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -941,7 +941,7 @@ static struct action_ops snd_pcm_action_stop = {
  *
  * The state of each stream is then changed to the given state unconditionally.
  */
-int snd_pcm_stop(struct snd_pcm_substream *substream, int state)
+int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t state)
 {
         return snd_pcm_action(&snd_pcm_action_stop, substream, state);
 }
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 99a485f13648..f2436d33fbf7 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1052,7 +1052,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
                 } else {
 #ifdef CONFIG_COMPAT
                         if (client->convert32 && snd_seq_ev_is_varusr(&event)) {
-                                void *ptr = compat_ptr(event.data.raw32.d[1]);
+                                void *ptr = (void __force *)compat_ptr(event.data.raw32.d[1]);
                                 event.data.ext.ptr = ptr;
                         }
 #endif
@@ -2407,7 +2407,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg)
         if (client == NULL)
                 return -ENXIO;
         fs = snd_enter_user();
-        result = snd_seq_do_ioctl(client, cmd, (void __user *)arg);
+        result = snd_seq_do_ioctl(client, cmd, (void __force __user *)arg);
         snd_leave_user(fs);
         return result;
 }
@@ -2497,9 +2497,6 @@ static void snd_seq_info_dump_ports(struct snd_info_buffer *buffer,
 }
 
 
-void snd_seq_info_pool(struct snd_info_buffer *buffer,
-                       struct snd_seq_pool *pool, char *space);
-
 /* exported to seq_info.c */
 void snd_seq_info_clients_read(struct snd_info_entry *entry, 
                                struct snd_info_buffer *buffer)
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 7fb55436287f..7f50c1437675 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -86,7 +86,7 @@ int snd_seq_dump_var_event(const struct snd_seq_event *event,
 
         if (event->data.ext.len & SNDRV_SEQ_EXT_USRPTR) {
                 char buf[32];
-                char __user *curptr = (char __user *)event->data.ext.ptr;
+                char __user *curptr = (char __force __user *)event->data.ext.ptr;
                 while (len > 0) {
                         int size = sizeof(buf);
                         if (len < size)
@@ -157,7 +157,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char
         if (event->data.ext.len & SNDRV_SEQ_EXT_USRPTR) {
                 if (! in_kernel)
                         return -EINVAL;
-                if (copy_from_user(buf, (void __user *)event->data.ext.ptr, len))
+                if (copy_from_user(buf, (void __force __user *)event->data.ext.ptr, len))
                         return -EFAULT;
                 return newlen;
         }
@@ -343,7 +343,7 @@ int snd_seq_event_dup(struct snd_seq_pool *pool, struct snd_seq_event *event,
                                 tmp->event = src->event;
                                 src = src->next;
                         } else if (is_usrptr) {
-                                if (copy_from_user(&tmp->event, (char __user *)buf, size)) {
+                                if (copy_from_user(&tmp->event, (char __force __user *)buf, size)) {
                                         err = -EFAULT;
                                         goto __error;
                                 }
diff --git a/sound/core/seq/seq_memory.h b/sound/core/seq/seq_memory.h
index 63e91431a29f..4a2ec779b8a7 100644
--- a/sound/core/seq/seq_memory.h
+++ b/sound/core/seq/seq_memory.h
@@ -24,6 +24,8 @@
 #include <sound/seq_kernel.h>
 #include <linux/poll.h>
 
+struct snd_info_buffer;
+
 /* container for sequencer event (internal use) */
 struct snd_seq_event_cell {
         struct snd_seq_event event;
@@ -99,5 +101,7 @@ void snd_sequencer_memory_done(void);
 /* polling */
 int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file, poll_table *wait);
 
+void snd_seq_info_pool(struct snd_info_buffer *buffer,
+                       struct snd_seq_pool *pool, char *space);
 
 #endif
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
index 3bf7d73ac52e..e12bcd94b6db 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
@@ -412,7 +412,7 @@ int snd_seq_get_port_info(struct snd_seq_client_port * port,
  * initialization or termination of devices (see seq_midi.c).
  *
  * If callback_all option is set, the callback function is invoked
- * at each connnection/disconnection. 
+ * at each connection/disconnection. 
  */
 
 static int subscribe_port(struct snd_seq_client *client,
diff --git a/sound/core/timer.c b/sound/core/timer.c
index ed016329e911..7c1cbf0a0dc4 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -186,9 +186,8 @@ static void snd_timer_check_slave(struct snd_timer_instance *slave)
                 list_for_each_entry(master, &timer->open_list_head, open_list) {
                         if (slave->slave_class == master->slave_class &&
                             slave->slave_id == master->slave_id) {
-                                list_del(&slave->open_list);
-                                list_add_tail(&slave->open_list,
-                                              &master->slave_list_head);
+                                list_move_tail(&slave->open_list,
+                                               &master->slave_list_head);
                                 spin_lock_irq(&slave_active_lock);
                                 slave->master = master;
                                 slave->timer = master->timer;
@@ -414,8 +413,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event)
 static int snd_timer_start1(struct snd_timer *timer, struct snd_timer_instance *timeri,
                             unsigned long sticks)
 {
-        list_del(&timeri->active_list);
-        list_add_tail(&timeri->active_list, &timer->active_list_head);
+        list_move_tail(&timeri->active_list, &timer->active_list_head);
         if (timer->running) {
                 if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE)
                         goto __start_now;
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 3b9b550109cb..a89948ae9e8d 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -18,7 +18,7 @@
  * a subset of information returned via ctl info callback
  */
 struct link_ctl_info {
-        int type;               /* value type */
+        snd_ctl_elem_type_t type; /* value type */
         int count;              /* item count */
         int min_val, max_val;   /* min, max values */
 };
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index 12b44b0b6777..a0da7755fcea 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -482,8 +482,9 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
                         cable->streams[SNDRV_PCM_STREAM_CAPTURE];
         unsigned long delta_play = 0, delta_capt = 0;
         unsigned int running;
+        unsigned long flags;
 
-        spin_lock(&cable->lock);        
+        spin_lock_irqsave(&cable->lock, flags);
         running = cable->running ^ cable->pause;
         if (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) {
                 delta_play = jiffies - dpcm_play->last_jiffies;
@@ -495,10 +496,8 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
                 dpcm_capt->last_jiffies += delta_capt;
         }
 
-        if (delta_play == 0 && delta_capt == 0) {
-                spin_unlock(&cable->lock);
-                return running;
-        }
+        if (delta_play == 0 && delta_capt == 0)
+                goto unlock;
                 
         if (delta_play > delta_capt) {
                 loopback_bytepos_update(dpcm_play, delta_play - delta_capt,
@@ -510,14 +509,14 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable)
                 delta_capt = delta_play;
         }
 
-        if (delta_play == 0 && delta_capt == 0) {
-                spin_unlock(&cable->lock);
-                return running;
-        }
+        if (delta_play == 0 && delta_capt == 0)
+                goto unlock;
+
         /* note delta_capt == delta_play at this moment */
         loopback_bytepos_update(dpcm_capt, delta_capt, BYTEPOS_UPDATE_COPY);
         loopback_bytepos_update(dpcm_play, delta_play, BYTEPOS_UPDATE_POSONLY);
-        spin_unlock(&cable->lock);
+ unlock:
+        spin_unlock_irqrestore(&cable->lock, flags);
         return running;
 }
 
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index fcb14a099822..7c7793a0eb25 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -526,31 +526,21 @@ bad:
 }
 
 
-/* These device names follow the official Linux device list,
- * Documentation/devices.txt.  Let us know if there are other
- * common names we should support for compatibility.
- * Only those devices not created by the generic code in sound_core.c are
- * registered here.
- */
-static const struct {
-        unsigned short minor;
-        char *name;
-        umode_t mode;
-        int *num;
-} dev_list[] = { /* list of minor devices */
-/* seems to be some confusion here -- this device is not in the device list */
-        {SND_DEV_DSP16,     "dspW",      S_IWUGO | S_IRUSR | S_IRGRP,
-         &num_audiodevs},
-        {SND_DEV_AUDIO,     "audio",     S_IWUGO | S_IRUSR | S_IRGRP,
-         &num_audiodevs},
-};
-
 static int dmabuf;
 static int dmabug;
 
 module_param(dmabuf, int, 0444);
 module_param(dmabug, int, 0444);
 
+/* additional minors for compatibility */
+struct oss_minor_dev {
+        unsigned short minor;
+        unsigned int enabled;
+} dev_list[] = {
+        { SND_DEV_DSP16 },
+        { SND_DEV_AUDIO },
+};
+
 static int __init oss_init(void)
 {
         int             err;
@@ -571,18 +561,12 @@ static int __init oss_init(void)
         sound_dmap_flag = (dmabuf > 0 ? 1 : 0);
 
         for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-                device_create(sound_class, NULL,
-                              MKDEV(SOUND_MAJOR, dev_list[i].minor), NULL,
-                              "%s", dev_list[i].name);
-
-                if (!dev_list[i].num)
-                        continue;
-
-                for (j = 1; j < *dev_list[i].num; j++)
-                        device_create(sound_class, NULL,
-                                      MKDEV(SOUND_MAJOR,
-                                            dev_list[i].minor + (j*0x10)),
-                                      NULL, "%s%d", dev_list[i].name, j);
+                j = 0;
+                do {
+                        unsigned short minor = dev_list[i].minor + j * 0x10;
+                        if (!register_sound_special(&oss_sound_fops, minor))
+                                dev_list[i].enabled = (1 << j);
+                } while (++j < num_audiodevs);
         }
 
         if (sound_nblocks >= MAX_MEM_BLOCKS - 1)
@@ -596,11 +580,11 @@ static void __exit oss_cleanup(void)
         int i, j;
 
         for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-                device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor));
-                if (!dev_list[i].num)
-                        continue;
-                for (j = 1; j < *dev_list[i].num; j++)
-                        device_destroy(sound_class, MKDEV(SOUND_MAJOR, dev_list[i].minor + (j*0x10)));
+                j = 0;
+                do {
+                        if (dev_list[i].enabled & (1 << j))
+                                unregister_sound_special(dev_list[i].minor);
+                } while (++j < num_audiodevs);
         }
         
         unregister_sound_special(1);
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 9823d59d7ad7..389cd7931668 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -152,10 +152,16 @@ config SND_AZT3328
         select SND_MPU401_UART
         select SND_PCM
         select SND_RAWMIDI
+        select SND_AC97_CODEC
         help
           Say Y here to include support for Aztech AZF3328 (PCI168)
           soundcards.
 
+          Supported features: AC97-"conformant" mixer, MPU401/OPL3, analog I/O
+          (16bit/8bit, many sample rates [<= 66.2kHz], NO hardware mixing),
+          Digital Enhanced Game Port, 1.024MHz multimedia sequencer timer,
+          ext. codec (I2S port), onboard amp (4W/4Ohms/ch), suspend/resume.
+
           To compile this driver as a module, choose M here: the module
           will be called snd-azt3328.
 
@@ -572,13 +578,13 @@ comment "Don't forget to add built-in firmwares for HDSP driver"
         depends on SND_HDSP=y
 
 config SND_HDSPM
-        tristate "RME Hammerfall DSP MADI"
+        tristate "RME Hammerfall DSP MADI/RayDAT/AIO"
         select SND_HWDEP
         select SND_RAWMIDI
         select SND_PCM
         help
-          Say Y here to include support for RME Hammerfall DSP MADI
-          soundcards.
+          Say Y here to include support for RME Hammerfall DSP MADI,
+          RayDAT and AIO soundcards.
 
           To compile this driver as a module, choose M here: the module
           will be called snd-hdspm.
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index cb62d178b3e0..7f4d619f4ddb 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -71,6 +71,12 @@ static const struct ac97_codec_id snd_ac97_codec_id_vendors[] = {
 { 0x414b4d00, 0xffffff00, "Asahi Kasei",        NULL,   NULL },
 { 0x414c4300, 0xffffff00, "Realtek",            NULL,   NULL },
 { 0x414c4700, 0xffffff00, "Realtek",            NULL,   NULL },
+/*
+ * This is an _inofficial_ Aztech Labs entry
+ * (value might differ from unknown official Aztech ID),
+ * currently used by the AC97 emulation of the almost-AC97 PCI168 card.
+ */
+{ 0x415a5400, 0xffffff00, "Aztech Labs (emulated)",     NULL,   NULL },
 { 0x434d4900, 0xffffff00, "C-Media Electronics", NULL,  NULL },
 { 0x43525900, 0xffffff00, "Cirrus Logic",       NULL,   NULL },
 { 0x43585400, 0xffffff00, "Conexant",           NULL,   NULL },
@@ -127,6 +133,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x414c4781, 0xffffffff, "ALC658D",            NULL,   NULL }, /* already patched */
 { 0x414c4780, 0xfffffff0, "ALC658",             patch_alc655,   NULL },
 { 0x414c4790, 0xfffffff0, "ALC850",             patch_alc850,   NULL },
+{ 0x415a5401, 0xffffffff, "AZF3328",            patch_aztech_azf3328,   NULL },
 { 0x434d4941, 0xffffffff, "CMI9738",            patch_cm9738,   NULL },
 { 0x434d4961, 0xffffffff, "CMI9739",            patch_cm9739,   NULL },
 { 0x434d4969, 0xffffffff, "CMI9780",            patch_cm9780,   NULL },
@@ -590,9 +597,9 @@ static int snd_ac97_put_volsw(struct snd_kcontrol *kcontrol,
         snd_ac97_page_restore(ac97, page_save);
 #ifdef CONFIG_SND_AC97_POWER_SAVE
         /* check analog mixer power-down */
-        if ((val_mask & 0x8000) &&
+        if ((val_mask & AC97_PD_EAPD) &&
             (kcontrol->private_value & (1<<30))) {
-                if (val & 0x8000)
+                if (val & AC97_PD_EAPD)
                         ac97->power_up &= ~(1 << (reg>>1));
                 else
                         ac97->power_up |= 1 << (reg>>1);
@@ -1035,20 +1042,20 @@ static int snd_ac97_dev_free(struct snd_device *device)
 
 static int snd_ac97_try_volume_mix(struct snd_ac97 * ac97, int reg)
 {
-        unsigned short val, mask = 0x8000;
+        unsigned short val, mask = AC97_MUTE_MASK_MONO;
 
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
         switch (reg) {
         case AC97_MASTER_TONE:
-                return ac97->caps & 0x04 ? 1 : 0;
+                return ac97->caps & AC97_BC_BASS_TREBLE ? 1 : 0;
         case AC97_HEADPHONE:
-                return ac97->caps & 0x10 ? 1 : 0;
+                return ac97->caps & AC97_BC_HEADPHONE ? 1 : 0;
         case AC97_REC_GAIN_MIC:
-                return ac97->caps & 0x01 ? 1 : 0;
+                return ac97->caps & AC97_BC_DEDICATED_MIC ? 1 : 0;
         case AC97_3D_CONTROL:
-                if (ac97->caps & 0x7c00) {
+                if (ac97->caps & AC97_BC_3D_TECH_ID_MASK) {
                         val = snd_ac97_read(ac97, reg);
                         /* if nonzero - fixed and we can't set it */
                         return val == 0;
@@ -1104,7 +1111,10 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha
         *lo_max = *hi_max = 0;
         for (i = 0 ; i < ARRAY_SIZE(cbit); i++) {
                 unsigned short val;
-                snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8));
+                snd_ac97_write(
+                        ac97, reg,
+                        AC97_MUTE_MASK_STEREO | cbit[i] | (cbit[i] << 8)
+                );
                 /* Do the read twice due to buffers on some ac97 codecs.
                  * e.g. The STAC9704 returns exactly what you wrote to the register
                  * if you read it immediately. This causes the detect routine to fail.
@@ -1139,14 +1149,14 @@ static void snd_ac97_change_volume_params2(struct snd_ac97 * ac97, int reg, int
         unsigned short val, val1;
 
         *max = 63;
-        val = 0x8080 | (0x20 << shift);
+        val = AC97_MUTE_MASK_STEREO | (0x20 << shift);
         snd_ac97_write(ac97, reg, val);
         val1 = snd_ac97_read(ac97, reg);
         if (val != val1) {
                 *max = 31;
         }
         /* reset volume to zero */
-        snd_ac97_write_cache(ac97, reg, 0x8080);
+        snd_ac97_write_cache(ac97, reg, AC97_MUTE_MASK_STEREO);
 }
 
 static inline int printable(unsigned int x)
@@ -1183,16 +1193,16 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,
         if (! snd_ac97_valid_reg(ac97, reg))
                 return 0;
 
-        mute_mask = 0x8000;
+        mute_mask = AC97_MUTE_MASK_MONO;
         val = snd_ac97_read(ac97, reg);
         if (check_stereo || (ac97->flags & AC97_STEREO_MUTES)) {
                 /* check whether both mute bits work */
-                val1 = val | 0x8080;
+                val1 = val | AC97_MUTE_MASK_STEREO;
                 snd_ac97_write(ac97, reg, val1);
                 if (val1 == snd_ac97_read(ac97, reg))
-                        mute_mask = 0x8080;
+                        mute_mask = AC97_MUTE_MASK_STEREO;
         }
-        if (mute_mask == 0x8080) {
+        if (mute_mask == AC97_MUTE_MASK_STEREO) {
                 struct snd_kcontrol_new tmp = AC97_DOUBLE(name, reg, 15, 7, 1, 1);
                 if (check_amix)
                         tmp.private_value |= (1 << 30);
@@ -1268,9 +1278,11 @@ static int snd_ac97_cvol_new(struct snd_card *card, char *name, int reg, unsigne
         err = snd_ctl_add(card, kctl);
         if (err < 0)
                 return err;
-        snd_ac97_write_cache(ac97, reg,
-                             (snd_ac97_read(ac97, reg) & 0x8080) |
-                             lo_max | (hi_max << 8));
+        snd_ac97_write_cache(
+                ac97, reg,
+                (snd_ac97_read(ac97, reg) & AC97_MUTE_MASK_STEREO)
+                | lo_max | (hi_max << 8)
+        );
         return 0;
 }
 
@@ -1332,7 +1344,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         return err;
         }
 
-        ac97->regs[AC97_CENTER_LFE_MASTER] = 0x8080;
+        ac97->regs[AC97_CENTER_LFE_MASTER] = AC97_MUTE_MASK_STEREO;
 
         /* build center controls */
         if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) 
@@ -1410,8 +1422,12 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
                         if ((err = snd_ctl_add(card, kctl = snd_ac97_cnew(&snd_ac97_controls_pc_beep[idx], ac97))) < 0)
                                 return err;
                 set_tlv_db_scale(kctl, db_scale_4bit);
-                snd_ac97_write_cache(ac97, AC97_PC_BEEP,
-                                     snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e);
+                snd_ac97_write_cache(
+                        ac97,
+                        AC97_PC_BEEP,
+                        (snd_ac97_read(ac97, AC97_PC_BEEP)
+                                | AC97_MUTE_MASK_MONO | 0x001e)
+                );
         }
         
         /* build Phone controls */
@@ -1545,7 +1561,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Simulated Stereo Enhancement control */
-        if (ac97->caps & 0x0008) {
+        if (ac97->caps & AC97_BC_SIM_STEREO) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_STEREO_ENHANCEMENT], ac97))) < 0)
                         return err;
         }
@@ -1557,7 +1573,7 @@ static int snd_ac97_mixer_build(struct snd_ac97 * ac97)
         }
 
         /* build Loudness control */
-        if (ac97->caps & 0x0020) {
+        if (ac97->caps & AC97_BC_LOUDNESS) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_general[AC97_GENERAL_LOUDNESS], ac97))) < 0)
                         return err;
         }
@@ -2542,8 +2558,8 @@ void snd_ac97_resume(struct snd_ac97 *ac97)
                         schedule_timeout_uninterruptible(1);
                 } while (time_after_eq(end_time, jiffies));
                 /* FIXME: extra delay */
-                ac97->bus->ops->write(ac97, AC97_MASTER, 0x8000);
-                if (snd_ac97_read(ac97, AC97_MASTER) != 0x8000)
+                ac97->bus->ops->write(ac97, AC97_MASTER, AC97_MUTE_MASK_MONO);
+                if (snd_ac97_read(ac97, AC97_MASTER) != AC97_MUTE_MASK_MONO)
                         msleep(250);
         } else {
                 end_time = jiffies + msecs_to_jiffies(100);
@@ -2747,12 +2763,12 @@ static int master_mute_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2765,7 +2781,10 @@ static int tune_mute_led(struct snd_ac97 *ac97)
                 return -ENOENT;
         msw->put = master_mute_sw_put;
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(
+                ac97, AC97_POWERDOWN,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         ac97->scaps |= AC97_SCAP_EAPD_LED;
         return 0;
 }
@@ -2780,12 +2799,12 @@ static int hp_master_mute_sw_put(struct snd_kcontrol *kcontrol,
                 int rshift = (kcontrol->private_value >> 12) & 0x0f;
                 unsigned short mask;
                 if (shift != rshift)
-                        mask = 0x8080;
+                        mask = AC97_MUTE_MASK_STEREO;
                 else
-                        mask = 0x8000;
-                snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000,
+                        mask = AC97_MUTE_MASK_MONO;
+                snd_ac97_update_bits(ac97, AC97_POWERDOWN, AC97_PD_EAPD,
                                      (ac97->regs[AC97_MASTER] & mask) == mask ?
-                                     0x8000 : 0);
+                                     AC97_PD_EAPD : 0);
         }
         return err;
 }
@@ -2801,7 +2820,10 @@ static int tune_hp_mute_led(struct snd_ac97 *ac97)
         snd_ac97_remove_ctl(ac97, "External Amplifier", NULL);
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Switch");
         snd_ac97_remove_ctl(ac97, "Headphone Playback", "Volume");
-        snd_ac97_update_bits(ac97, AC97_POWERDOWN, 0x8000, 0x8000); /* mute LED on */
+        snd_ac97_update_bits(
+                ac97, AC97_POWERDOWN,
+                AC97_PD_EAPD, AC97_PD_EAPD /* mute LED on */
+        );
         return 0;
 }
 
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index bf47574ca1f0..200c9a1d48b7 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -27,6 +27,15 @@
 #include "ac97_patch.h"
 
 /*
+ *  Forward declarations
+ */
+
+static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97,
+                                                    const char *name);
+static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
+                                const unsigned int *tlv, const char **slaves);
+
+/*
  *  Chip specific initialization
  */
 
@@ -2940,6 +2949,49 @@ static int patch_alc850(struct snd_ac97 *ac97)
         return 0;
 }
 
+static int patch_aztech_azf3328_specific(struct snd_ac97 *ac97)
+{
+        struct snd_kcontrol *kctl_3d_center =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Center");
+        struct snd_kcontrol *kctl_3d_depth =
+                snd_ac97_find_mixer_ctl(ac97, "3D Control - Depth");
+
+        /*
+         * 3D register is different from AC97 standard layout
+         * (also do some renaming, to resemble Windows driver naming)
+         */
+        if (kctl_3d_center) {
+                kctl_3d_center->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 1, 0x07, 0);
+                snd_ac97_rename_vol_ctl(ac97,
+                        "3D Control - Center", "3D Control - Width"
+                );
+        }
+        if (kctl_3d_depth)
+                kctl_3d_depth->private_value =
+                        AC97_SINGLE_VALUE(AC97_3D_CONTROL, 8, 0x03, 0);
+
+        /* Aztech Windows driver calls the
+           equivalent control "Modem Playback", thus rename it: */
+        snd_ac97_rename_vol_ctl(ac97,
+                "Master Mono Playback", "Modem Playback"
+        );
+        snd_ac97_rename_vol_ctl(ac97,
+                "Headphone Playback", "FM Synth Playback"
+        );
+
+        return 0;
+}
+
+static const struct snd_ac97_build_ops patch_aztech_azf3328_ops = {
+        .build_specific = patch_aztech_azf3328_specific
+};
+
+static int patch_aztech_azf3328(struct snd_ac97 *ac97)
+{
+        ac97->build_ops = &patch_aztech_azf3328_ops;
+        return 0;
+}
 
 /*
  * C-Media CM97xx codecs
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index c80b0b863c54..0ac1f98d91a1 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -21,6 +21,7 @@
  *  would appreciate it if you grant us the right to use those modifications
  *  for any purpose including commercial applications.
  */
+
 /* >0: print Hw params, timer vars. >1: print stream write/copy sizes  */
 #define REALLY_VERBOSE_LOGGING 0
 
@@ -36,16 +37,12 @@
 #define VPRINTK2(...)
 #endif
 
-#ifndef ASI_STYLE_NAMES
-/* not sure how ALSA style name should look */
-#define ASI_STYLE_NAMES 1
-#endif
-
 #include "hpi_internal.h"
 #include "hpimsginit.h"
 #include "hpioctl.h"
 
 #include <linux/pci.h>
+#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/slab.h>
@@ -85,11 +82,11 @@ MODULE_PARM_DESC(enable_hpi_hwdep,
 
 /* identify driver */
 #ifdef KERNEL_ALSA_BUILD
-static char *build_info = "built using headers from kernel source";
+static char *build_info = "Built using headers from kernel source";
 module_param(build_info, charp, S_IRUGO);
 MODULE_PARM_DESC(build_info, "built using headers from kernel source");
 #else
-static char *build_info = "built within ALSA source";
+static char *build_info = "Built within ALSA source";
 module_param(build_info, charp, S_IRUGO);
 MODULE_PARM_DESC(build_info, "built within ALSA source");
 #endif
@@ -100,13 +97,14 @@ static const int mixer_dump;
 #define DEFAULT_SAMPLERATE 44100
 static int adapter_fs = DEFAULT_SAMPLERATE;
 
-static struct hpi_hsubsys *ss;  /* handle to HPI audio subsystem */
-
 /* defaults */
 #define PERIODS_MIN 2
-#define PERIOD_BYTES_MIN  2304
+#define PERIOD_BYTES_MIN  2048
 #define BUFFER_BYTES_MAX (512 * 1024)
 
+/* convert stream to character */
+#define SCHR(s) ((s == SNDRV_PCM_STREAM_PLAYBACK) ? 'P' : 'C')
+
 /*#define TIMER_MILLISECONDS 20
 #define FORCE_TIMER_JIFFIES ((TIMER_MILLISECONDS * HZ + 999)/1000)
 */
@@ -152,11 +150,12 @@ struct snd_card_asihpi_pcm {
         struct timer_list timer;
         unsigned int respawn_timer;
         unsigned int hpi_buffer_attached;
-        unsigned int pcm_size;
-        unsigned int pcm_count;
+        unsigned int buffer_bytes;
+        unsigned int period_bytes;
         unsigned int bytes_per_sec;
-        unsigned int pcm_irq_pos;       /* IRQ position */
-        unsigned int pcm_buf_pos;       /* position in buffer */
+        unsigned int pcm_buf_host_rw_ofs; /* Host R/W pos */
+        unsigned int pcm_buf_dma_ofs;   /* DMA R/W offset in buffer */
+        unsigned int pcm_buf_elapsed_dma_ofs;   /* DMA R/W offset in buffer */
         struct snd_pcm_substream *substream;
         u32 h_stream;
         struct hpi_format format;
@@ -167,7 +166,6 @@ struct snd_card_asihpi_pcm {
 /* Functions to allow driver to give a buffer to HPI for busmastering */
 
 static u16 hpi_stream_host_buffer_attach(
-        struct hpi_hsubsys *hS,
         u32 h_stream,   /* handle to outstream. */
         u32 size_in_bytes, /* size in bytes of bus mastering buffer */
         u32 pci_address
@@ -194,10 +192,7 @@ static u16 hpi_stream_host_buffer_attach(
         return hr.error;
 }
 
-static u16 hpi_stream_host_buffer_detach(
-        struct hpi_hsubsys *hS,
-        u32  h_stream
-)
+static u16 hpi_stream_host_buffer_detach(u32  h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -218,24 +213,23 @@ static u16 hpi_stream_host_buffer_detach(
         return hr.error;
 }
 
-static inline u16 hpi_stream_start(struct hpi_hsubsys *hS, u32 h_stream)
+static inline u16 hpi_stream_start(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_start(hS, h_stream);
+                return hpi_outstream_start(h_stream);
         else
-                return hpi_instream_start(hS, h_stream);
+                return hpi_instream_start(h_stream);
 }
 
-static inline u16 hpi_stream_stop(struct hpi_hsubsys *hS, u32 h_stream)
+static inline u16 hpi_stream_stop(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_stop(hS, h_stream);
+                return hpi_outstream_stop(h_stream);
         else
-                return hpi_instream_stop(hS, h_stream);
+                return hpi_instream_stop(h_stream);
 }
 
 static inline u16 hpi_stream_get_info_ex(
-    struct hpi_hsubsys *hS,
     u32 h_stream,
     u16        *pw_state,
     u32        *pbuffer_size,
@@ -244,42 +238,43 @@ static inline u16 hpi_stream_get_info_ex(
     u32        *pauxiliary_data
 )
 {
+        u16 e;
         if (hpi_handle_object(h_stream)  ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_get_info_ex(hS, h_stream, pw_state,
+                e = hpi_outstream_get_info_ex(h_stream, pw_state,
                                         pbuffer_size, pdata_in_buffer,
                                         psample_count, pauxiliary_data);
         else
-                return hpi_instream_get_info_ex(hS, h_stream, pw_state,
+                e = hpi_instream_get_info_ex(h_stream, pw_state,
                                         pbuffer_size, pdata_in_buffer,
                                         psample_count, pauxiliary_data);
+        return e;
 }
 
-static inline u16 hpi_stream_group_add(struct hpi_hsubsys *hS,
+static inline u16 hpi_stream_group_add(
                                         u32 h_master,
                                         u32 h_stream)
 {
         if (hpi_handle_object(h_master) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_add(hS, h_master, h_stream);
+                return hpi_outstream_group_add(h_master, h_stream);
         else
-                return hpi_instream_group_add(hS, h_master, h_stream);
+                return hpi_instream_group_add(h_master, h_stream);
 }
 
-static inline u16 hpi_stream_group_reset(struct hpi_hsubsys *hS,
-                                                u32 h_stream)
+static inline u16 hpi_stream_group_reset(u32 h_stream)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_reset(hS, h_stream);
+                return hpi_outstream_group_reset(h_stream);
         else
-                return hpi_instream_group_reset(hS, h_stream);
+                return hpi_instream_group_reset(h_stream);
 }
 
-static inline u16 hpi_stream_group_get_map(struct hpi_hsubsys *hS,
+static inline u16 hpi_stream_group_get_map(
                                 u32 h_stream, u32 *mo, u32 *mi)
 {
         if (hpi_handle_object(h_stream) ==  HPI_OBJ_OSTREAM)
-                return hpi_outstream_group_get_map(hS, h_stream, mo, mi);
+                return hpi_outstream_group_get_map(h_stream, mo, mi);
         else
-                return hpi_instream_group_get_map(hS, h_stream, mo, mi);
+                return hpi_instream_group_get_map(h_stream, mo, mi);
 }
 
 static u16 handle_error(u16 err, int line, char *filename)
@@ -299,11 +294,11 @@ static void print_hwparams(struct snd_pcm_hw_params *p)
 {
         snd_printd("HWPARAMS \n");
         snd_printd("samplerate %d \n", params_rate(p));
-        snd_printd("channels %d \n", params_channels(p));
-        snd_printd("format %d \n", params_format(p));
+        snd_printd("Channels %d \n", params_channels(p));
+        snd_printd("Format %d \n", params_format(p));
         snd_printd("subformat %d \n", params_subformat(p));
-        snd_printd("buffer bytes %d \n", params_buffer_bytes(p));
-        snd_printd("period bytes %d \n", params_period_bytes(p));
+        snd_printd("Buffer bytes %d \n", params_buffer_bytes(p));
+        snd_printd("Period bytes %d \n", params_period_bytes(p));
         snd_printd("access %d \n", params_access(p));
         snd_printd("period_size %d \n", params_period_size(p));
         snd_printd("periods %d \n", params_periods(p));
@@ -335,7 +330,7 @@ static snd_pcm_format_t hpi_to_alsa_formats[] = {
          */
         -1
 #else
-        /* SNDRV_PCM_FORMAT_S24_3LE */  /* { HPI_FORMAT_PCM24_SIGNED        15 */
+        /* SNDRV_PCM_FORMAT_S24_3LE */ /* HPI_FORMAT_PCM24_SIGNED 15 */
 #endif
 };
 
@@ -378,20 +373,20 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,
         } else {
                 /* on cards without SRC,
                    valid rates are determined by sampleclock */
-                err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+                err = hpi_mixer_get_control(asihpi->h_mixer,
                                           HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                           HPI_CONTROL_SAMPLECLOCK, &h_control);
                 if (err) {
                         snd_printk(KERN_ERR
-                                "no local sampleclock, err %d\n", err);
+                                "No local sampleclock, err %d\n", err);
                 }
 
                 for (idx = 0; idx < 100; idx++) {
-                        if (hpi_sample_clock_query_local_rate(ss,
+                        if (hpi_sample_clock_query_local_rate(
                                 h_control, idx, &sample_rate)) {
                                 if (!idx)
                                         snd_printk(KERN_ERR
-                                                "local rate query failed\n");
+                                                "Local rate query failed\n");
 
                                 break;
                         }
@@ -480,10 +475,10 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
                         format, params_rate(params), 0, 0));
 
         if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
-                if (hpi_instream_reset(ss, dpcm->h_stream) != 0)
+                if (hpi_instream_reset(dpcm->h_stream) != 0)
                         return -EINVAL;
 
-                if (hpi_instream_set_format(ss,
+                if (hpi_instream_set_format(
                         dpcm->h_stream, &dpcm->format) != 0)
                         return -EINVAL;
         }
@@ -491,10 +486,10 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
         dpcm->hpi_buffer_attached = 0;
         if (card->support_mmap) {
 
-                err = hpi_stream_host_buffer_attach(ss, dpcm->h_stream,
+                err = hpi_stream_host_buffer_attach(dpcm->h_stream,
                         params_buffer_bytes(params),  runtime->dma_addr);
                 if (err == 0) {
-                        snd_printd(KERN_INFO
+                        VPRINTK1(KERN_INFO
                                 "stream_host_buffer_attach succeeded %u %lu\n",
                                 params_buffer_bytes(params),
                                 (unsigned long)runtime->dma_addr);
@@ -505,11 +500,11 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
                         return -ENOMEM;
                 }
 
-                err = hpi_stream_get_info_ex(ss, dpcm->h_stream, NULL,
+                err = hpi_stream_get_info_ex(dpcm->h_stream, NULL,
                                                 &dpcm->hpi_buffer_attached,
                                                 NULL, NULL, NULL);
 
-                snd_printd(KERN_INFO "stream_host_buffer_attach status 0x%x\n",
+                VPRINTK1(KERN_INFO "stream_host_buffer_attach status 0x%x\n",
                                 dpcm->hpi_buffer_attached);
         }
         bytes_per_sec = params_rate(params) * params_channels(params);
@@ -520,16 +515,32 @@ static int snd_card_asihpi_pcm_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
 
         dpcm->bytes_per_sec = bytes_per_sec;
-        dpcm->pcm_size = params_buffer_bytes(params);
-        dpcm->pcm_count = params_period_bytes(params);
-        snd_printd(KERN_INFO "pcm_size=%d, pcm_count=%d, bps=%d\n",
-                        dpcm->pcm_size, dpcm->pcm_count, bytes_per_sec);
+        dpcm->buffer_bytes = params_buffer_bytes(params);
+        dpcm->period_bytes = params_period_bytes(params);
+        VPRINTK1(KERN_INFO "buffer_bytes=%d, period_bytes=%d, bps=%d\n",
+                        dpcm->buffer_bytes, dpcm->period_bytes, bytes_per_sec);
 
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
         return 0;
 }
 
+static int
+snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
+        if (dpcm->hpi_buffer_attached)
+                hpi_stream_host_buffer_detach(dpcm->h_stream);
+
+        snd_pcm_lib_free_pages(substream);
+        return 0;
+}
+
+static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)
+{
+        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
+        kfree(dpcm);
+}
+
 static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *
                                             substream)
 {
@@ -537,9 +548,9 @@ static void snd_card_asihpi_pcm_timer_start(struct snd_pcm_substream *
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
         int expiry;
 
-        expiry = (dpcm->pcm_count * HZ / dpcm->bytes_per_sec);
-        /* wait longer the first time, for samples to propagate */
-        expiry = max(expiry, 20);
+        expiry = HZ / 200;
+        /*? (dpcm->period_bytes * HZ / dpcm->bytes_per_sec); */
+        expiry = max(expiry, 1); /* don't let it be zero! */
         dpcm->timer.expires = jiffies + expiry;
         dpcm->respawn_timer = 1;
         add_timer(&dpcm->timer);
@@ -562,37 +573,44 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
         struct snd_pcm_substream *s;
         u16 e;
 
-        snd_printd("trigger %dstream %d\n",
-                        substream->stream, substream->number);
+        VPRINTK1(KERN_INFO "%c%d trigger\n",
+                        SCHR(substream->stream), substream->number);
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
                 snd_pcm_group_for_each_entry(s, substream) {
-                        struct snd_card_asihpi_pcm *ds;
-                        ds = s->runtime->private_data;
+                        struct snd_pcm_runtime *runtime = s->runtime;
+                        struct snd_card_asihpi_pcm *ds = runtime->private_data;
 
                         if (snd_pcm_substream_chip(s) != card)
                                 continue;
 
+                        /* don't link Cap and Play */
+                        if (substream->stream != s->stream)
+                                continue;
+
                         if ((s->stream == SNDRV_PCM_STREAM_PLAYBACK) &&
                                 (card->support_mmap)) {
                                 /* How do I know how much valid data is present
-                                * in buffer? Just guessing 2 periods, but if
+                                * in buffer? Must be at least one period!
+                                * Guessing 2 periods, but if
                                 * buffer is bigger it may contain even more
                                 * data??
                                 */
-                                unsigned int preload = ds->pcm_count * 2;
-                                VPRINTK2("preload %d\n", preload);
+                                unsigned int preload = ds->period_bytes * 1;
+                                VPRINTK2(KERN_INFO "%d preload x%x\n", s->number, preload);
                                 hpi_handle_error(hpi_outstream_write_buf(
-                                                ss, ds->h_stream,
-                                                &s->runtime->dma_area[0],
+                                                ds->h_stream,
+                                                &runtime->dma_area[0],
                                                 preload,
                                                 &ds->format));
+                                ds->pcm_buf_host_rw_ofs = preload;
                         }
 
                         if (card->support_grouping) {
-                                VPRINTK1("\t_group %dstream %d\n", s->stream,
+                                VPRINTK1(KERN_INFO "\t%c%d group\n",
+                                                SCHR(s->stream),
                                                 s->number);
-                                e = hpi_stream_group_add(ss,
+                                e = hpi_stream_group_add(
                                         dpcm->h_stream,
                                         ds->h_stream);
                                 if (!e) {
@@ -604,10 +622,12 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
                         } else
                                 break;
                 }
-                snd_printd("start\n");
+                VPRINTK1(KERN_INFO "start\n");
                 /* start the master stream */
                 snd_card_asihpi_pcm_timer_start(substream);
-                hpi_handle_error(hpi_stream_start(ss, dpcm->h_stream));
+                if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE) ||
+                        !card->support_mmap)
+                        hpi_handle_error(hpi_stream_start(dpcm->h_stream));
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
@@ -615,88 +635,73 @@ static int snd_card_asihpi_trigger(struct snd_pcm_substream *substream,
                 snd_pcm_group_for_each_entry(s, substream) {
                         if (snd_pcm_substream_chip(s) != card)
                                 continue;
+                        /* don't link Cap and Play */
+                        if (substream->stream != s->stream)
+                                continue;
 
                         /*? workaround linked streams don't
                         transition to SETUP 20070706*/
                         s->runtime->status->state = SNDRV_PCM_STATE_SETUP;
 
                         if (card->support_grouping) {
-                                VPRINTK1("\t_group %dstream %d\n", s->stream,
+                                VPRINTK1(KERN_INFO "\t%c%d group\n",
+                                SCHR(s->stream),
                                         s->number);
                                 snd_pcm_trigger_done(s, substream);
                         } else
                                 break;
                 }
-                snd_printd("stop\n");
+                VPRINTK1(KERN_INFO "stop\n");
 
                 /* _prepare and _hwparams reset the stream */
-                hpi_handle_error(hpi_stream_stop(ss, dpcm->h_stream));
+                hpi_handle_error(hpi_stream_stop(dpcm->h_stream));
                 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                         hpi_handle_error(
-                                hpi_outstream_reset(ss, dpcm->h_stream));
+                                hpi_outstream_reset(dpcm->h_stream));
 
                 if (card->support_grouping)
-                        hpi_handle_error(hpi_stream_group_reset(ss,
-                                                dpcm->h_stream));
+                        hpi_handle_error(hpi_stream_group_reset(dpcm->h_stream));
                 break;
 
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                snd_printd("pause release\n");
-                hpi_handle_error(hpi_stream_start(ss, dpcm->h_stream));
+                VPRINTK1(KERN_INFO "pause release\n");
+                hpi_handle_error(hpi_stream_start(dpcm->h_stream));
                 snd_card_asihpi_pcm_timer_start(substream);
                 break;
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                snd_printd("pause\n");
+                VPRINTK1(KERN_INFO "pause\n");
                 snd_card_asihpi_pcm_timer_stop(substream);
-                hpi_handle_error(hpi_stream_stop(ss, dpcm->h_stream));
+                hpi_handle_error(hpi_stream_stop(dpcm->h_stream));
                 break;
         default:
-                snd_printd("\tINVALID\n");
+                snd_printd(KERN_ERR "\tINVALID\n");
                 return -EINVAL;
         }
 
         return 0;
 }
 
-static int
-snd_card_asihpi_hw_free(struct snd_pcm_substream *substream)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        if (dpcm->hpi_buffer_attached)
-                hpi_stream_host_buffer_detach(ss, dpcm->h_stream);
-
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
-static void snd_card_asihpi_runtime_free(struct snd_pcm_runtime *runtime)
-{
-        struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        kfree(dpcm);
-}
-
 /*algorithm outline
  Without linking degenerates to getting single stream pos etc
  Without mmap 2nd loop degenerates to snd_pcm_period_elapsed
 */
 /*
-buf_pos=get_buf_pos(s);
+pcm_buf_dma_ofs=get_buf_pos(s);
 for_each_linked_stream(s) {
-        buf_pos=get_buf_pos(s);
-        min_buf_pos = modulo_min(min_buf_pos, buf_pos, pcm_size)
-        new_data = min(new_data, calc_new_data(buf_pos,irq_pos)
+        pcm_buf_dma_ofs=get_buf_pos(s);
+        min_buf_pos = modulo_min(min_buf_pos, pcm_buf_dma_ofs, buffer_bytes)
+        new_data = min(new_data, calc_new_data(pcm_buf_dma_ofs,irq_pos)
 }
 timer.expires = jiffies + predict_next_period_ready(min_buf_pos);
 for_each_linked_stream(s) {
-        s->buf_pos = min_buf_pos;
-        if (new_data > pcm_count) {
+        s->pcm_buf_dma_ofs = min_buf_pos;
+        if (new_data > period_bytes) {
                 if (mmap) {
-                        irq_pos = (irq_pos + pcm_count) % pcm_size;
+                        irq_pos = (irq_pos + period_bytes) % buffer_bytes;
                         if (playback) {
-                                write(pcm_count);
+                                write(period_bytes);
                         } else {
-                                read(pcm_count);
+                                read(period_bytes);
                         }
                 }
                 snd_pcm_period_elapsed(s);
@@ -724,105 +729,136 @@ static inline unsigned int modulo_min(unsigned int a, unsigned int b,
 static void snd_card_asihpi_timer_function(unsigned long data)
 {
         struct snd_card_asihpi_pcm *dpcm = (struct snd_card_asihpi_pcm *)data;
-        struct snd_card_asihpi *card = snd_pcm_substream_chip(dpcm->substream);
+        struct snd_pcm_substream *substream = dpcm->substream;
+        struct snd_card_asihpi *card = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime;
         struct snd_pcm_substream *s;
         unsigned int newdata = 0;
-        unsigned int buf_pos, min_buf_pos = 0;
+        unsigned int pcm_buf_dma_ofs, min_buf_pos = 0;
         unsigned int remdata, xfercount, next_jiffies;
         int first = 1;
+        int loops = 0;
         u16 state;
-        u32 buffer_size, data_avail, samples_played, aux;
+        u32 buffer_size, bytes_avail, samples_played, on_card_bytes;
+
+        VPRINTK1(KERN_INFO "%c%d snd_card_asihpi_timer_function\n",
+                                SCHR(substream->stream), substream->number);
 
         /* find minimum newdata and buffer pos in group */
-        snd_pcm_group_for_each_entry(s, dpcm->substream) {
+        snd_pcm_group_for_each_entry(s, substream) {
                 struct snd_card_asihpi_pcm *ds = s->runtime->private_data;
                 runtime = s->runtime;
 
                 if (snd_pcm_substream_chip(s) != card)
                         continue;
 
-                hpi_handle_error(hpi_stream_get_info_ex(ss,
+                /* don't link Cap and Play */
+                if (substream->stream != s->stream)
+                        continue;
+
+                hpi_handle_error(hpi_stream_get_info_ex(
                                         ds->h_stream, &state,
-                                        &buffer_size, &data_avail,
-                                        &samples_played, &aux));
+                                        &buffer_size, &bytes_avail,
+                                        &samples_played, &on_card_bytes));
 
                 /* number of bytes in on-card buffer */
-                runtime->delay = aux;
-
-                if (state == HPI_STATE_DRAINED) {
-                        snd_printd(KERN_WARNING  "outstream %d drained\n",
-                                        s->number);
-                        snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
-                        return;
-                }
+                runtime->delay = on_card_bytes;
 
                 if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                        buf_pos = frames_to_bytes(runtime, samples_played);
-                } else {
-                        buf_pos = data_avail + ds->pcm_irq_pos;
-                }
+                        pcm_buf_dma_ofs = ds->pcm_buf_host_rw_ofs - bytes_avail;
+                        if (state == HPI_STATE_STOPPED) {
+                                if ((bytes_avail == 0) &&
+                                    (on_card_bytes < ds->pcm_buf_host_rw_ofs)) {
+                                        hpi_handle_error(hpi_stream_start(ds->h_stream));
+                                        VPRINTK1(KERN_INFO "P%d start\n", s->number);
+                                }
+                        } else if (state == HPI_STATE_DRAINED) {
+                                VPRINTK1(KERN_WARNING "P%d drained\n",
+                                                s->number);
+                                /*snd_pcm_stop(s, SNDRV_PCM_STATE_XRUN);
+                                continue; */
+                        }
+                } else
+                        pcm_buf_dma_ofs = bytes_avail + ds->pcm_buf_host_rw_ofs;
 
                 if (first) {
                         /* can't statically init min when wrap is involved */
-                        min_buf_pos = buf_pos;
-                        newdata = (buf_pos - ds->pcm_irq_pos) % ds->pcm_size;
+                        min_buf_pos = pcm_buf_dma_ofs;
+                        newdata = (pcm_buf_dma_ofs - ds->pcm_buf_elapsed_dma_ofs) % ds->buffer_bytes;
                         first = 0;
                 } else {
                         min_buf_pos =
-                                modulo_min(min_buf_pos, buf_pos, UINT_MAX+1L);
+                                modulo_min(min_buf_pos, pcm_buf_dma_ofs, UINT_MAX+1L);
                         newdata = min(
-                                (buf_pos - ds->pcm_irq_pos) % ds->pcm_size,
+                                (pcm_buf_dma_ofs - ds->pcm_buf_elapsed_dma_ofs) % ds->buffer_bytes,
                                 newdata);
                 }
 
-                VPRINTK1("PB timer hw_ptr x%04lX, appl_ptr x%04lX\n",
+                VPRINTK1(KERN_INFO "PB timer hw_ptr x%04lX, appl_ptr x%04lX\n",
                         (unsigned long)frames_to_bytes(runtime,
                                                 runtime->status->hw_ptr),
                         (unsigned long)frames_to_bytes(runtime,
                                                 runtime->control->appl_ptr));
-                VPRINTK1("%d S=%d, irq=%04X, pos=x%04X, left=x%04X,"
-                        " aux=x%04X space=x%04X\n", s->number,
-                        state,  ds->pcm_irq_pos, buf_pos, (int)data_avail,
-                        (int)aux, buffer_size-data_avail);
+
+                VPRINTK1(KERN_INFO "%d %c%d S=%d, rw=%04X, dma=x%04X, left=x%04X,"
+                        " aux=x%04X space=x%04X\n",
+                        loops, SCHR(s->stream), s->number,
+                        state,  ds->pcm_buf_host_rw_ofs, pcm_buf_dma_ofs, (int)bytes_avail,
+                        (int)on_card_bytes, buffer_size-bytes_avail);
+                loops++;
         }
+        pcm_buf_dma_ofs = min_buf_pos;
 
-        remdata = newdata % dpcm->pcm_count;
-        xfercount = newdata - remdata; /* a multiple of pcm_count */
-        next_jiffies = ((dpcm->pcm_count-remdata) * HZ / dpcm->bytes_per_sec)+1;
-        next_jiffies = max(next_jiffies, 2U * HZ / 1000U);
+        remdata = newdata % dpcm->period_bytes;
+        xfercount = newdata - remdata; /* a multiple of period_bytes */
+        /* come back when on_card_bytes has decreased enough to allow
+           write to happen, or when data has been consumed to make another
+           period
+        */
+        if (xfercount && (on_card_bytes  > dpcm->period_bytes))
+                next_jiffies = ((on_card_bytes - dpcm->period_bytes) * HZ / dpcm->bytes_per_sec);
+        else
+                next_jiffies = ((dpcm->period_bytes - remdata) * HZ / dpcm->bytes_per_sec);
+
+        next_jiffies = max(next_jiffies, 1U);
         dpcm->timer.expires = jiffies + next_jiffies;
-        VPRINTK1("jif %d buf pos x%04X newdata x%04X xc x%04X\n",
-                        next_jiffies, min_buf_pos, newdata, xfercount);
+        VPRINTK1(KERN_INFO "jif %d buf pos x%04X newdata x%04X xfer x%04X\n",
+                        next_jiffies, pcm_buf_dma_ofs, newdata, xfercount);
 
-        snd_pcm_group_for_each_entry(s, dpcm->substream) {
+        snd_pcm_group_for_each_entry(s, substream) {
                 struct snd_card_asihpi_pcm *ds = s->runtime->private_data;
-                ds->pcm_buf_pos = min_buf_pos;
 
-                if (xfercount) {
+                /* don't link Cap and Play */
+                if (substream->stream != s->stream)
+                        continue;
+
+                ds->pcm_buf_dma_ofs = pcm_buf_dma_ofs;
+
+                if (xfercount && (on_card_bytes <= ds->period_bytes)) {
                         if (card->support_mmap) {
-                                ds->pcm_irq_pos = ds->pcm_irq_pos + xfercount;
                                 if (s->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                                        VPRINTK2("write OS%d x%04x\n",
+                                        VPRINTK2(KERN_INFO "P%d write x%04x\n",
                                                         s->number,
-                                                        ds->pcm_count);
+                                                        ds->period_bytes);
                                         hpi_handle_error(
                                                 hpi_outstream_write_buf(
-                                                        ss, ds->h_stream,
+                                                        ds->h_stream,
                                                         &s->runtime->
                                                                 dma_area[0],
                                                         xfercount,
                                                         &ds->format));
                                 } else {
-                                        VPRINTK2("read IS%d x%04x\n",
+                                        VPRINTK2(KERN_INFO "C%d read x%04x\n",
                                                 s->number,
-                                                dpcm->pcm_count);
+                                                xfercount);
                                         hpi_handle_error(
                                                 hpi_instream_read_buf(
-                                                        ss, ds->h_stream,
+                                                        ds->h_stream,
                                                         NULL, xfercount));
                                 }
+                                ds->pcm_buf_host_rw_ofs = ds->pcm_buf_host_rw_ofs + xfercount;
                         } /* else R/W will be handled by read/write callbacks */
+                        ds->pcm_buf_elapsed_dma_ofs = pcm_buf_dma_ofs;
                         snd_pcm_period_elapsed(s);
                 }
         }
@@ -845,12 +881,12 @@ static int snd_card_asihpi_playback_prepare(struct snd_pcm_substream *
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        snd_printd(KERN_INFO "playback prepare %d\n", substream->number);
-
-        hpi_handle_error(hpi_outstream_reset(ss, dpcm->h_stream));
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
+        VPRINTK1(KERN_INFO "playback prepare %d\n", substream->number);
 
+        hpi_handle_error(hpi_outstream_reset(dpcm->h_stream));
+        dpcm->pcm_buf_host_rw_ofs = 0;
+        dpcm->pcm_buf_dma_ofs = 0;
+        dpcm->pcm_buf_elapsed_dma_ofs = 0;
         return 0;
 }
 
@@ -861,27 +897,8 @@ snd_card_asihpi_playback_pointer(struct snd_pcm_substream *substream)
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
         snd_pcm_uframes_t ptr;
 
-        u32 samples_played;
-        u16 err;
-
-        if (!snd_pcm_stream_linked(substream)) {
-                /* NOTE, can use samples played for playback position here and
-                * in timer fn because it LAGS the actual read pointer, and is a
-                * better representation of actual playout position
-                */
-                err = hpi_outstream_get_info_ex(ss, dpcm->h_stream, NULL,
-                                        NULL, NULL,
-                                        &samples_played, NULL);
-                hpi_handle_error(err);
-
-                dpcm->pcm_buf_pos = frames_to_bytes(runtime, samples_played);
-        }
-        /* else must return most conservative value found in timer func
-         * by looping over all streams
-         */
-
-        ptr = bytes_to_frames(runtime, dpcm->pcm_buf_pos  % dpcm->pcm_size);
-        VPRINTK2("playback_pointer=%04ld\n", (unsigned long)ptr);
+        ptr = bytes_to_frames(runtime, dpcm->pcm_buf_dma_ofs  % dpcm->buffer_bytes);
+        /* VPRINTK2(KERN_INFO "playback_pointer=x%04lx\n", (unsigned long)ptr); */
         return ptr;
 }
 
@@ -898,12 +915,12 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
         /* on cards without SRC, must query at valid rate,
         * maybe set by external sync
         */
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
-                err = hpi_sample_clock_get_sample_rate(ss, h_control,
+                err = hpi_sample_clock_get_sample_rate(h_control,
                                 &sample_rate);
 
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
@@ -911,7 +928,7 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
                 err = hpi_format_create(&hpi_format,
                                         2, format, sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_outstream_query_format(ss, h_stream,
+                        err = hpi_outstream_query_format(h_stream,
                                                         &hpi_format);
                 if (!err && (hpi_to_alsa_formats[format] != -1))
                         pcmhw->formats |=
@@ -942,7 +959,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
                 return -ENOMEM;
 
         err =
-            hpi_outstream_open(ss, card->adapter_index,
+            hpi_outstream_open(card->adapter_index,
                               substream->number, &dpcm->h_stream);
         hpi_handle_error(err);
         if (err)
@@ -998,11 +1015,11 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
         snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                 card->update_interval_frames);
         snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                card->update_interval_frames * 4, UINT_MAX);
+                card->update_interval_frames * 2, UINT_MAX);
 
         snd_pcm_set_sync(substream);
 
-        snd_printd(KERN_INFO "playback open\n");
+        VPRINTK1(KERN_INFO "playback open\n");
 
         return 0;
 }
@@ -1012,8 +1029,8 @@ static int snd_card_asihpi_playback_close(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        hpi_handle_error(hpi_outstream_close(ss, dpcm->h_stream));
-        snd_printd(KERN_INFO "playback close\n");
+        hpi_handle_error(hpi_outstream_close(dpcm->h_stream));
+        VPRINTK1(KERN_INFO "playback close\n");
 
         return 0;
 }
@@ -1036,9 +1053,11 @@ static int snd_card_asihpi_playback_copy(struct snd_pcm_substream *substream,
         VPRINTK2(KERN_DEBUG "playback copy%d %u bytes\n",
                         substream->number, len);
 
-        hpi_handle_error(hpi_outstream_write_buf(ss, dpcm->h_stream,
+        hpi_handle_error(hpi_outstream_write_buf(dpcm->h_stream,
                                 runtime->dma_area, len, &dpcm->format));
 
+        dpcm->pcm_buf_host_rw_ofs = dpcm->pcm_buf_host_rw_ofs + len;
+
         return 0;
 }
 
@@ -1052,10 +1071,10 @@ static int snd_card_asihpi_playback_silence(struct snd_pcm_substream *
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
         len = frames_to_bytes(runtime, count);
-        snd_printd(KERN_INFO "playback silence  %u bytes\n", len);
+        VPRINTK1(KERN_INFO "playback silence  %u bytes\n", len);
 
         memset(runtime->dma_area, 0, len);
-        hpi_handle_error(hpi_outstream_write_buf(ss, dpcm->h_stream,
+        hpi_handle_error(hpi_outstream_write_buf(dpcm->h_stream,
                                 runtime->dma_area, len, &dpcm->format));
         return 0;
 }
@@ -1091,13 +1110,13 @@ snd_card_asihpi_capture_pointer(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        VPRINTK2("capture pointer %d=%d\n",
-                        substream->number, dpcm->pcm_buf_pos);
-        /* NOTE Unlike playback can't use actual dwSamplesPlayed
+        VPRINTK2(KERN_INFO "capture pointer %d=%d\n",
+                        substream->number, dpcm->pcm_buf_dma_ofs);
+        /* NOTE Unlike playback can't use actual samples_played
                 for the capture position, because those samples aren't yet in
                 the local buffer available for reading.
         */
-        return bytes_to_frames(runtime, dpcm->pcm_buf_pos % dpcm->pcm_size);
+        return bytes_to_frames(runtime, dpcm->pcm_buf_dma_ofs % dpcm->buffer_bytes);
 }
 
 static int snd_card_asihpi_capture_ioctl(struct snd_pcm_substream *substream,
@@ -1111,11 +1130,12 @@ static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
 
-        hpi_handle_error(hpi_instream_reset(ss, dpcm->h_stream));
-        dpcm->pcm_irq_pos = 0;
-        dpcm->pcm_buf_pos = 0;
+        hpi_handle_error(hpi_instream_reset(dpcm->h_stream));
+        dpcm->pcm_buf_host_rw_ofs = 0;
+        dpcm->pcm_buf_dma_ofs = 0;
+        dpcm->pcm_buf_elapsed_dma_ofs = 0;
 
-        snd_printd("capture prepare %d\n", substream->number);
+        VPRINTK1("Capture Prepare %d\n", substream->number);
         return 0;
 }
 
@@ -1133,12 +1153,12 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
 
         /* on cards without SRC, must query at valid rate,
                 maybe set by external sync */
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
-                err = hpi_sample_clock_get_sample_rate(ss, h_control,
+                err = hpi_sample_clock_get_sample_rate(h_control,
                         &sample_rate);
 
         for (format = HPI_FORMAT_PCM8_UNSIGNED;
@@ -1147,7 +1167,7 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
                 err = hpi_format_create(&hpi_format, 2, format,
                                 sample_rate, 128000, 0);
                 if (!err)
-                        err = hpi_instream_query_format(ss, h_stream,
+                        err = hpi_instream_query_format(h_stream,
                                             &hpi_format);
                 if (!err)
                         pcmhw->formats |=
@@ -1178,11 +1198,11 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
         if (dpcm == NULL)
                 return -ENOMEM;
 
-        snd_printd("hpi_instream_open adapter %d stream %d\n",
+        VPRINTK1("hpi_instream_open adapter %d stream %d\n",
                    card->adapter_index, substream->number);
 
         err = hpi_handle_error(
-            hpi_instream_open(ss, card->adapter_index,
+            hpi_instream_open(card->adapter_index,
                              substream->number, &dpcm->h_stream));
         if (err)
                 kfree(dpcm);
@@ -1209,6 +1229,9 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
                 snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_MMAP |
                                                 SNDRV_PCM_INFO_MMAP_VALID;
 
+        if (card->support_grouping)
+                snd_card_asihpi_capture.info |= SNDRV_PCM_INFO_SYNC_START;
+
         runtime->hw = snd_card_asihpi_capture;
 
         if (card->support_mmap)
@@ -1231,7 +1254,7 @@ static int snd_card_asihpi_capture_close(struct snd_pcm_substream *substream)
 {
         struct snd_card_asihpi_pcm *dpcm = substream->runtime->private_data;
 
-        hpi_handle_error(hpi_instream_close(ss, dpcm->h_stream));
+        hpi_handle_error(hpi_instream_close(dpcm->h_stream));
         return 0;
 }
 
@@ -1241,18 +1264,17 @@ static int snd_card_asihpi_capture_copy(struct snd_pcm_substream *substream,
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_card_asihpi_pcm *dpcm = runtime->private_data;
-        u32 data_size;
+        u32 len;
 
-        data_size = frames_to_bytes(runtime, count);
+        len = frames_to_bytes(runtime, count);
 
-        VPRINTK2("capture copy%d %d bytes\n", substream->number, data_size);
-        hpi_handle_error(hpi_instream_read_buf(ss, dpcm->h_stream,
-                                runtime->dma_area, data_size));
+        VPRINTK2(KERN_INFO "capture copy%d %d bytes\n", substream->number, len);
+        hpi_handle_error(hpi_instream_read_buf(dpcm->h_stream,
+                                runtime->dma_area, len));
 
-        /* Used by capture_pointer */
-        dpcm->pcm_irq_pos = dpcm->pcm_irq_pos + data_size;
+        dpcm->pcm_buf_host_rw_ofs = dpcm->pcm_buf_host_rw_ofs + len;
 
-        if (copy_to_user(dst, runtime->dma_area, data_size))
+        if (copy_to_user(dst, runtime->dma_area, len))
                 return -EFAULT;
 
         return 0;
@@ -1287,7 +1309,7 @@ static int __devinit snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi,
         struct snd_pcm *pcm;
         int err;
 
-        err = snd_pcm_new(asihpi->card, "asihpi PCM", device,
+        err = snd_pcm_new(asihpi->card, "Asihpi PCM", device,
                          asihpi->num_outstreams, asihpi->num_instreams,
                          &pcm);
         if (err < 0)
@@ -1307,7 +1329,7 @@ static int __devinit snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi,
 
         pcm->private_data = asihpi;
         pcm->info_flags = 0;
-        strcpy(pcm->name, "asihpi PCM");
+        strcpy(pcm->name, "Asihpi PCM");
 
         /*? do we want to emulate MMAP for non-BBM cards?
         Jack doesn't work with ALSAs MMAP emulation - WHY NOT? */
@@ -1330,8 +1352,7 @@ struct hpi_control {
         char name[44]; /* copied to snd_ctl_elem_id.name[44]; */
 };
 
-static char *asihpi_tuner_band_names[] =
-{
+static const char * const asihpi_tuner_band_names[] = {
         "invalid",
         "AM",
         "FM mono",
@@ -1349,70 +1370,36 @@ compile_time_assert(
                 (HPI_TUNER_BAND_LAST+1)),
         assert_tuner_band_names_size);
 
-#if ASI_STYLE_NAMES
-static char *asihpi_src_names[] =
-{
+static const char * const asihpi_src_names[] = {
         "no source",
-        "outstream",
-        "line_in",
-        "aes_in",
-        "tuner",
+        "PCM",
+        "Line",
+        "Digital",
+        "Tuner",
         "RF",
-        "clock",
-        "bitstr",
-        "mic",
-        "cobranet",
-        "analog_in",
-        "adapter",
+        "Clock",
+        "Bitstream",
+        "Microphone",
+        "Cobranet",
+        "Analog",
+        "Adapter",
 };
-#else
-static char *asihpi_src_names[] =
-{
-        "no source",
-        "PCM playback",
-        "line in",
-        "digital in",
-        "tuner",
-        "RF",
-        "clock",
-        "bitstream",
-        "mic",
-        "cobranet in",
-        "analog in",
-        "adapter",
-};
-#endif
 
 compile_time_assert(
         (ARRAY_SIZE(asihpi_src_names) ==
                 (HPI_SOURCENODE_LAST_INDEX-HPI_SOURCENODE_NONE+1)),
         assert_src_names_size);
 
-#if ASI_STYLE_NAMES
-static char *asihpi_dst_names[] =
-{
-        "no destination",
-        "instream",
-        "line_out",
-        "aes_out",
-        "RF",
-        "speaker" ,
-        "cobranet",
-        "analog_out",
-};
-#else
-static char *asihpi_dst_names[] =
-{
+static const char * const asihpi_dst_names[] = {
         "no destination",
-        "PCM capture",
-        "line out",
-        "digital out",
+        "PCM",
+        "Line",
+        "Digital",
         "RF",
-        "speaker",
-        "cobranet out",
-        "analog out"
+        "Speaker",
+        "Cobranet Out",
+        "Analog"
 };
-#endif
 
 compile_time_assert(
         (ARRAY_SIZE(asihpi_dst_names) ==
@@ -1438,30 +1425,45 @@ static void asihpi_ctl_init(struct snd_kcontrol_new *snd_control,
                                 struct hpi_control *hpi_ctl,
                                 char *name)
 {
+        char *dir = "";
         memset(snd_control, 0, sizeof(*snd_control));
         snd_control->name = hpi_ctl->name;
         snd_control->private_value = hpi_ctl->h_control;
         snd_control->iface = SNDRV_CTL_ELEM_IFACE_MIXER;
         snd_control->index = 0;
 
+        if (hpi_ctl->dst_node_type + HPI_DESTNODE_NONE == HPI_DESTNODE_ISTREAM)
+                dir = "Capture ";  /* On or towards a PCM capture destination*/
+        else if ((hpi_ctl->src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &&
+                (!hpi_ctl->dst_node_type))
+                dir = "Capture "; /* On a source node that is not PCM playback */
+        else if (hpi_ctl->src_node_type &&
+                (hpi_ctl->src_node_type + HPI_SOURCENODE_NONE != HPI_SOURCENODE_OSTREAM) &&
+                (hpi_ctl->dst_node_type))
+                dir = "Monitor Playback "; /* Between an input and an output */
+        else
+                dir = "Playback "; /* PCM Playback source, or  output node */
+
         if (hpi_ctl->src_node_type && hpi_ctl->dst_node_type)
-                sprintf(hpi_ctl->name, "%s%d to %s%d %s",
+                sprintf(hpi_ctl->name, "%s%d %s%d %s%s",
                         asihpi_src_names[hpi_ctl->src_node_type],
                         hpi_ctl->src_node_index,
                         asihpi_dst_names[hpi_ctl->dst_node_type],
                         hpi_ctl->dst_node_index,
-                        name);
+                        dir, name);
         else if (hpi_ctl->dst_node_type) {
-                sprintf(hpi_ctl->name, "%s%d %s",
+                sprintf(hpi_ctl->name, "%s %d %s%s",
                 asihpi_dst_names[hpi_ctl->dst_node_type],
                 hpi_ctl->dst_node_index,
-                name);
+                dir, name);
         } else {
-                sprintf(hpi_ctl->name, "%s%d %s",
+                sprintf(hpi_ctl->name, "%s %d %s%s",
                 asihpi_src_names[hpi_ctl->src_node_type],
                 hpi_ctl->src_node_index,
-                name);
+                dir, name);
         }
+        /* printk(KERN_INFO "Adding %s %d to %d ",  hpi_ctl->name,
+                hpi_ctl->wSrcNodeType, hpi_ctl->wDstNodeType); */
 }
 
 /*------------------------------------------------------------
@@ -1478,7 +1480,7 @@ static int snd_asihpi_volume_info(struct snd_kcontrol *kcontrol,
         short max_gain_mB;
         short step_gain_mB;
 
-        err = hpi_volume_query_range(ss, h_control,
+        err = hpi_volume_query_range(h_control,
                         &min_gain_mB, &max_gain_mB, &step_gain_mB);
         if (err) {
                 max_gain_mB = 0;
@@ -1500,7 +1502,7 @@ static int snd_asihpi_volume_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short an_gain_mB[HPI_MAX_CHANNELS];
 
-        hpi_handle_error(hpi_volume_get_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_volume_get_gain(h_control, an_gain_mB));
         ucontrol->value.integer.value[0] = an_gain_mB[0] / VOL_STEP_mB;
         ucontrol->value.integer.value[1] = an_gain_mB[1] / VOL_STEP_mB;
 
@@ -1522,7 +1524,7 @@ static int snd_asihpi_volume_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_volume[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_volume_set_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_volume_set_gain(h_control, an_gain_mB));
         return change;
 }
 
@@ -1534,7 +1536,7 @@ static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "volume");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Volume");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                 SNDRV_CTL_ELEM_ACCESS_TLV_READ;
         snd_control.info = snd_asihpi_volume_info;
@@ -1558,7 +1560,7 @@ static int snd_asihpi_level_info(struct snd_kcontrol *kcontrol,
         short step_gain_mB;
 
         err =
-            hpi_level_query_range(ss, h_control, &min_gain_mB,
+            hpi_level_query_range(h_control, &min_gain_mB,
                                &max_gain_mB, &step_gain_mB);
         if (err) {
                 max_gain_mB = 2400;
@@ -1580,7 +1582,7 @@ static int snd_asihpi_level_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short an_gain_mB[HPI_MAX_CHANNELS];
 
-        hpi_handle_error(hpi_level_get_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_level_get_gain(h_control, an_gain_mB));
         ucontrol->value.integer.value[0] =
             an_gain_mB[0] / HPI_UNITS_PER_dB;
         ucontrol->value.integer.value[1] =
@@ -1604,7 +1606,7 @@ static int snd_asihpi_level_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_level[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_level_set_gain(ss, h_control, an_gain_mB));
+        hpi_handle_error(hpi_level_set_gain(h_control, an_gain_mB));
         return change;
 }
 
@@ -1617,7 +1619,7 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,
         struct snd_kcontrol_new snd_control;
 
         /* can't use 'volume' cos some nodes have volume as well */
-        asihpi_ctl_init(&snd_control, hpi_ctl, "level");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Level");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
                                 SNDRV_CTL_ELEM_ACCESS_TLV_READ;
         snd_control.info = snd_asihpi_level_info;
@@ -1633,12 +1635,8 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi,
  ------------------------------------------------------------*/
 
 /* AESEBU format */
-static char *asihpi_aesebu_format_names[] =
-{
-        "N/A",
-        "S/PDIF",
-        "AES/EBU",
-};
+static const char * const asihpi_aesebu_format_names[] = {
+        "N/A", "S/PDIF", "AES/EBU" };
 
 static int snd_asihpi_aesebu_format_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
@@ -1659,12 +1657,12 @@ static int snd_asihpi_aesebu_format_info(struct snd_kcontrol *kcontrol,
 
 static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol,
-                        u16 (*func)(const struct hpi_hsubsys *, u32, u16 *))
+                        u16 (*func)(u32, u16 *))
 {
         u32 h_control = kcontrol->private_value;
         u16 source, err;
 
-        err = func(ss, h_control, &source);
+        err = func(h_control, &source);
 
         /* default to N/A */
         ucontrol->value.enumerated.item[0] = 0;
@@ -1681,7 +1679,7 @@ static int snd_asihpi_aesebu_format_get(struct snd_kcontrol *kcontrol,
 
 static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol,
-                         u16 (*func)(const struct hpi_hsubsys *, u32, u16))
+                         u16 (*func)(u32, u16))
 {
         u32 h_control = kcontrol->private_value;
 
@@ -1693,7 +1691,7 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
         if (ucontrol->value.enumerated.item[0] == 2)
                 source = HPI_AESEBU_FORMAT_AESEBU;
 
-        if (func(ss, h_control, source) != 0)
+        if (func(h_control, source) != 0)
                 return -EINVAL;
 
         return 1;
@@ -1702,13 +1700,13 @@ static int snd_asihpi_aesebu_format_put(struct snd_kcontrol *kcontrol,
 static int snd_asihpi_aesebu_rx_format_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,
-                                        HPI_AESEBU__receiver_get_format);
+                                        hpi_aesebu_receiver_get_format);
 }
 
 static int snd_asihpi_aesebu_rx_format_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,
-                                        HPI_AESEBU__receiver_set_format);
+                                        hpi_aesebu_receiver_set_format);
 }
 
 static int snd_asihpi_aesebu_rxstatus_info(struct snd_kcontrol *kcontrol,
@@ -1730,8 +1728,8 @@ static int snd_asihpi_aesebu_rxstatus_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u16 status;
 
-        hpi_handle_error(HPI_AESEBU__receiver_get_error_status(
-                                ss, h_control, &status));
+        hpi_handle_error(hpi_aesebu_receiver_get_error_status(
+                                         h_control, &status));
         ucontrol->value.integer.value[0] = status;
         return 0;
 }
@@ -1742,7 +1740,7 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "format");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Format");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_aesebu_format_info;
         snd_control.get = snd_asihpi_aesebu_rx_format_get;
@@ -1752,7 +1750,7 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
         if (ctl_add(card, &snd_control, asihpi) < 0)
                 return -EINVAL;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "status");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Status");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_aesebu_rxstatus_info;
@@ -1764,13 +1762,13 @@ static int __devinit snd_asihpi_aesebu_rx_add(struct snd_card_asihpi *asihpi,
 static int snd_asihpi_aesebu_tx_format_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_get(kcontrol, ucontrol,
-                                        HPI_AESEBU__transmitter_get_format);
+                                        hpi_aesebu_transmitter_get_format);
 }
 
 static int snd_asihpi_aesebu_tx_format_put(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol) {
         return snd_asihpi_aesebu_format_put(kcontrol, ucontrol,
-                                        HPI_AESEBU__transmitter_set_format);
+                                        hpi_aesebu_transmitter_set_format);
 }
 
 
@@ -1780,7 +1778,7 @@ static int __devinit snd_asihpi_aesebu_tx_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "format");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Format");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_aesebu_format_info;
         snd_control.get = snd_asihpi_aesebu_tx_format_get;
@@ -1804,7 +1802,7 @@ static int snd_asihpi_tuner_gain_info(struct snd_kcontrol *kcontrol,
         u16 gain_range[3];
 
         for (idx = 0; idx < 3; idx++) {
-                err = hpi_tuner_query_gain(ss, h_control,
+                err = hpi_tuner_query_gain(h_control,
                                           idx, &gain_range[idx]);
                 if (err != 0)
                         return err;
@@ -1827,7 +1825,7 @@ static int snd_asihpi_tuner_gain_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         short gain;
 
-        hpi_handle_error(hpi_tuner_get_gain(ss, h_control, &gain));
+        hpi_handle_error(hpi_tuner_get_gain(h_control, &gain));
         ucontrol->value.integer.value[0] = gain / HPI_UNITS_PER_dB;
 
         return 0;
@@ -1843,7 +1841,7 @@ static int snd_asihpi_tuner_gain_put(struct snd_kcontrol *kcontrol,
         short gain;
 
         gain = (ucontrol->value.integer.value[0]) * HPI_UNITS_PER_dB;
-        hpi_handle_error(hpi_tuner_set_gain(ss, h_control, gain));
+        hpi_handle_error(hpi_tuner_set_gain(h_control, gain));
 
         return 1;
 }
@@ -1857,7 +1855,7 @@ static int asihpi_tuner_band_query(struct snd_kcontrol *kcontrol,
         u32 i;
 
         for (i = 0; i < len; i++) {
-                err = hpi_tuner_query_band(ss,
+                err = hpi_tuner_query_band(
                                 h_control, i, &band_list[i]);
                 if (err != 0)
                         break;
@@ -1913,7 +1911,7 @@ static int snd_asihpi_tuner_band_get(struct snd_kcontrol *kcontrol,
         num_bands = asihpi_tuner_band_query(kcontrol, tuner_bands,
                                 HPI_TUNER_BAND_LAST);
 
-        hpi_handle_error(hpi_tuner_get_band(ss, h_control, &band));
+        hpi_handle_error(hpi_tuner_get_band(h_control, &band));
 
         ucontrol->value.enumerated.item[0] = -1;
         for (idx = 0; idx < HPI_TUNER_BAND_LAST; idx++)
@@ -1940,7 +1938,7 @@ static int snd_asihpi_tuner_band_put(struct snd_kcontrol *kcontrol,
                         HPI_TUNER_BAND_LAST);
 
         band = tuner_bands[ucontrol->value.enumerated.item[0]];
-        hpi_handle_error(hpi_tuner_set_band(ss, h_control, band));
+        hpi_handle_error(hpi_tuner_set_band(h_control, band));
 
         return 1;
 }
@@ -1965,7 +1963,7 @@ static int snd_asihpi_tuner_freq_info(struct snd_kcontrol *kcontrol,
 
         for (band_iter = 0; band_iter < num_bands; band_iter++) {
                 for (idx = 0; idx < 3; idx++) {
-                        err = hpi_tuner_query_frequency(ss, h_control,
+                        err = hpi_tuner_query_frequency(h_control,
                                 idx, tuner_bands[band_iter],
                                 &temp_freq_range[idx]);
                         if (err != 0)
@@ -1998,7 +1996,7 @@ static int snd_asihpi_tuner_freq_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u32 freq;
 
-        hpi_handle_error(hpi_tuner_get_frequency(ss, h_control, &freq));
+        hpi_handle_error(hpi_tuner_get_frequency(h_control, &freq));
         ucontrol->value.integer.value[0] = freq;
 
         return 0;
@@ -2011,7 +2009,7 @@ static int snd_asihpi_tuner_freq_put(struct snd_kcontrol *kcontrol,
         u32 freq;
 
         freq = ucontrol->value.integer.value[0];
-        hpi_handle_error(hpi_tuner_set_frequency(ss, h_control, freq));
+        hpi_handle_error(hpi_tuner_set_frequency(h_control, freq));
 
         return 1;
 }
@@ -2026,8 +2024,8 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
         snd_control.private_value = hpi_ctl->h_control;
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
 
-        if (!hpi_tuner_get_gain(ss, hpi_ctl->h_control, NULL)) {
-                asihpi_ctl_init(&snd_control, hpi_ctl, "gain");
+        if (!hpi_tuner_get_gain(hpi_ctl->h_control, NULL)) {
+                asihpi_ctl_init(&snd_control, hpi_ctl, "Gain");
                 snd_control.info = snd_asihpi_tuner_gain_info;
                 snd_control.get = snd_asihpi_tuner_gain_get;
                 snd_control.put = snd_asihpi_tuner_gain_put;
@@ -2036,7 +2034,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
                         return -EINVAL;
         }
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "band");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Band");
         snd_control.info = snd_asihpi_tuner_band_info;
         snd_control.get = snd_asihpi_tuner_band_get;
         snd_control.put = snd_asihpi_tuner_band_put;
@@ -2044,7 +2042,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi,
         if (ctl_add(card, &snd_control, asihpi) < 0)
                 return -EINVAL;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "freq");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Freq");
         snd_control.info = snd_asihpi_tuner_freq_info;
         snd_control.get = snd_asihpi_tuner_freq_get;
         snd_control.put = snd_asihpi_tuner_freq_put;
@@ -2095,7 +2093,7 @@ static int snd_asihpi_meter_get(struct snd_kcontrol *kcontrol,
         short an_gain_mB[HPI_MAX_CHANNELS], i;
         u16 err;
 
-        err = hpi_meter_get_peak(ss, h_control, an_gain_mB);
+        err = hpi_meter_get_peak(h_control, an_gain_mB);
 
         for (i = 0; i < HPI_MAX_CHANNELS; i++) {
                 if (err) {
@@ -2120,7 +2118,7 @@ static int __devinit snd_asihpi_meter_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "meter");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Meter");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_meter_info;
@@ -2140,7 +2138,7 @@ static int snd_card_asihpi_mux_count_sources(struct snd_kcontrol *snd_control)
         struct hpi_control hpi_ctl;
         int s, err;
         for (s = 0; s < 32; s++) {
-                err = hpi_multiplexer_query_source(ss, h_control, s,
+                err = hpi_multiplexer_query_source(h_control, s,
                                                   &hpi_ctl.
                                                   src_node_type,
                                                   &hpi_ctl.
@@ -2168,7 +2166,7 @@ static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol,
                     uinfo->value.enumerated.items - 1;
 
         err =
-            hpi_multiplexer_query_source(ss, h_control,
+            hpi_multiplexer_query_source(h_control,
                                         uinfo->value.enumerated.item,
                                         &src_node_type, &src_node_index);
 
@@ -2186,11 +2184,11 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
         u16 src_node_type, src_node_index;
         int s;
 
-        hpi_handle_error(hpi_multiplexer_get_source(ss, h_control,
+        hpi_handle_error(hpi_multiplexer_get_source(h_control,
                                 &source_type, &source_index));
         /* Should cache this search result! */
         for (s = 0; s < 256; s++) {
-                if (hpi_multiplexer_query_source(ss, h_control, s,
+                if (hpi_multiplexer_query_source(h_control, s,
                                             &src_node_type, &src_node_index))
                         break;
 
@@ -2201,7 +2199,7 @@ static int snd_asihpi_mux_get(struct snd_kcontrol *kcontrol,
                 }
         }
         snd_printd(KERN_WARNING
-                "control %x failed to match mux source %hu %hu\n",
+                "Control %x failed to match mux source %hu %hu\n",
                 h_control, source_type, source_index);
         ucontrol->value.enumerated.item[0] = 0;
         return 0;
@@ -2217,12 +2215,12 @@ static int snd_asihpi_mux_put(struct snd_kcontrol *kcontrol,
 
         change = 1;
 
-        e = hpi_multiplexer_query_source(ss, h_control,
+        e = hpi_multiplexer_query_source(h_control,
                                     ucontrol->value.enumerated.item[0],
                                     &source_type, &source_index);
         if (!e)
                 hpi_handle_error(
-                        hpi_multiplexer_set_source(ss, h_control,
+                        hpi_multiplexer_set_source(h_control,
                                                 source_type, source_index));
         return change;
 }
@@ -2234,11 +2232,7 @@ static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-#if ASI_STYLE_NAMES
-        asihpi_ctl_init(&snd_control, hpi_ctl, "multiplexer");
-#else
-        asihpi_ctl_init(&snd_control, hpi_ctl, "route");
-#endif
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Route");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_mux_info;
         snd_control.get = snd_asihpi_mux_get;
@@ -2254,33 +2248,38 @@ static int  __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi,
 static int snd_asihpi_cmode_info(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_info *uinfo)
 {
-        static char *mode_names[HPI_CHANNEL_MODE_LAST] = {
-                "normal", "swap",
-                "from_left", "from_right",
-                "to_left", "to_right"
+        static const char * const mode_names[HPI_CHANNEL_MODE_LAST + 1] = {
+                "invalid",
+                "Normal", "Swap",
+                "From Left", "From Right",
+                "To Left", "To Right"
         };
 
         u32 h_control = kcontrol->private_value;
         u16 mode;
         int i;
+        u16 mode_map[6];
+        int valid_modes = 0;
 
         /* HPI channel mode values can be from 1 to 6
         Some adapters only support a contiguous subset
         */
         for (i = 0; i < HPI_CHANNEL_MODE_LAST; i++)
-                if (hpi_channel_mode_query_mode(
-                        ss,  h_control, i, &mode))
-                        break;
+                if (!hpi_channel_mode_query_mode(
+                        h_control, i, &mode)) {
+                        mode_map[valid_modes] = mode;
+                        valid_modes++;
+                        }
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = i;
+        uinfo->value.enumerated.items = valid_modes;
 
-        if (uinfo->value.enumerated.item >= i)
-                uinfo->value.enumerated.item = i - 1;
+        if (uinfo->value.enumerated.item >= valid_modes)
+                uinfo->value.enumerated.item = valid_modes - 1;
 
         strcpy(uinfo->value.enumerated.name,
-               mode_names[uinfo->value.enumerated.item]);
+               mode_names[mode_map[uinfo->value.enumerated.item]]);
 
         return 0;
 }
@@ -2291,7 +2290,7 @@ static int snd_asihpi_cmode_get(struct snd_kcontrol *kcontrol,
         u32 h_control = kcontrol->private_value;
         u16 mode;
 
-        if (hpi_channel_mode_get(ss, h_control, &mode))
+        if (hpi_channel_mode_get(h_control, &mode))
                 mode = 1;
 
         ucontrol->value.enumerated.item[0] = mode - 1;
@@ -2307,7 +2306,7 @@ static int snd_asihpi_cmode_put(struct snd_kcontrol *kcontrol,
 
         change = 1;
 
-        hpi_handle_error(hpi_channel_mode_set(ss, h_control,
+        hpi_handle_error(hpi_channel_mode_set(h_control,
                            ucontrol->value.enumerated.item[0] + 1));
         return change;
 }
@@ -2319,7 +2318,7 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,
         struct snd_card *card = asihpi->card;
         struct snd_kcontrol_new snd_control;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "channel mode");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Mode");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
         snd_control.info = snd_asihpi_cmode_info;
         snd_control.get = snd_asihpi_cmode_get;
@@ -2331,15 +2330,12 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi,
 /*------------------------------------------------------------
    Sampleclock source  controls
  ------------------------------------------------------------*/
-
-static char *sampleclock_sources[MAX_CLOCKSOURCES] =
-    { "N/A", "local PLL", "AES/EBU sync", "word external", "word header",
-          "SMPTE", "AES/EBU in1", "auto", "network", "invalid",
-          "prev module",
-          "AES/EBU in2", "AES/EBU in3", "AES/EBU in4", "AES/EBU in5",
-          "AES/EBU in6", "AES/EBU in7", "AES/EBU in8"};
-
-
+static char *sampleclock_sources[MAX_CLOCKSOURCES] = {
+        "N/A", "Local PLL", "Digital Sync", "Word External", "Word Header",
+        "SMPTE", "Digital1", "Auto", "Network", "Invalid",
+        "Prev Module",
+        "Digital2", "Digital3", "Digital4", "Digital5",
+        "Digital6", "Digital7", "Digital8"};
 
 static int snd_asihpi_clksrc_info(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
@@ -2371,11 +2367,11 @@ static int snd_asihpi_clksrc_get(struct snd_kcontrol *kcontrol,
         int i;
 
         ucontrol->value.enumerated.item[0] = 0;
-        if (hpi_sample_clock_get_source(ss, h_control, &source))
+        if (hpi_sample_clock_get_source(h_control, &source))
                 source = 0;
 
         if (source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)
-                if (hpi_sample_clock_get_source_index(ss, h_control, &srcindex))
+                if (hpi_sample_clock_get_source_index(h_control, &srcindex))
                         srcindex = 0;
 
         for (i = 0; i < clkcache->count; i++)
@@ -2402,11 +2398,11 @@ static int snd_asihpi_clksrc_put(struct snd_kcontrol *kcontrol,
         if (item >= clkcache->count)
                 item = clkcache->count-1;
 
-        hpi_handle_error(hpi_sample_clock_set_source(ss,
+        hpi_handle_error(hpi_sample_clock_set_source(
                                 h_control, clkcache->s[item].source));
 
         if (clkcache->s[item].source == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT)
-                hpi_handle_error(hpi_sample_clock_set_source_index(ss,
+                hpi_handle_error(hpi_sample_clock_set_source_index(
                                 h_control, clkcache->s[item].index));
         return change;
 }
@@ -2434,7 +2430,7 @@ static int snd_asihpi_clklocal_get(struct snd_kcontrol *kcontrol,
         u32 rate;
         u16 e;
 
-        e = hpi_sample_clock_get_local_rate(ss, h_control, &rate);
+        e = hpi_sample_clock_get_local_rate(h_control, &rate);
         if (!e)
                 ucontrol->value.integer.value[0] = rate;
         else
@@ -2452,7 +2448,7 @@ static int snd_asihpi_clklocal_put(struct snd_kcontrol *kcontrol,
            asihpi->mixer_clkrate[addr][1] != right;
          */
         change = 1;
-        hpi_handle_error(hpi_sample_clock_set_local_rate(ss, h_control,
+        hpi_handle_error(hpi_sample_clock_set_local_rate(h_control,
                                       ucontrol->value.integer.value[0]));
         return change;
 }
@@ -2476,7 +2472,7 @@ static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol,
         u32 rate;
         u16 e;
 
-        e = hpi_sample_clock_get_sample_rate(ss, h_control, &rate);
+        e = hpi_sample_clock_get_sample_rate(h_control, &rate);
         if (!e)
                 ucontrol->value.integer.value[0] = rate;
         else
@@ -2501,7 +2497,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
         clkcache->has_local = 0;
 
         for (i = 0; i <= HPI_SAMPLECLOCK_SOURCE_LAST; i++) {
-                if  (hpi_sample_clock_query_source(ss, hSC,
+                if  (hpi_sample_clock_query_source(hSC,
                                 i, &source))
                         break;
                 clkcache->s[i].source = source;
@@ -2515,7 +2511,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
         if (has_aes_in)
                 /* already will have picked up index 0 above */
                 for (j = 1; j < 8; j++) {
-                        if (hpi_sample_clock_query_source_index(ss, hSC,
+                        if (hpi_sample_clock_query_source_index(hSC,
                                 j, HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT,
                                 &source))
                                 break;
@@ -2528,7 +2524,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
                 }
         clkcache->count = i;
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "source");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Source");
         snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;
         snd_control.info = snd_asihpi_clksrc_info;
         snd_control.get = snd_asihpi_clksrc_get;
@@ -2538,7 +2534,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
 
 
         if (clkcache->has_local) {
-                asihpi_ctl_init(&snd_control, hpi_ctl, "local_rate");
+                asihpi_ctl_init(&snd_control, hpi_ctl, "Localrate");
                 snd_control.access = SNDRV_CTL_ELEM_ACCESS_READWRITE ;
                 snd_control.info = snd_asihpi_clklocal_info;
                 snd_control.get = snd_asihpi_clklocal_get;
@@ -2549,7 +2545,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
                         return -EINVAL;
         }
 
-        asihpi_ctl_init(&snd_control, hpi_ctl, "rate");
+        asihpi_ctl_init(&snd_control, hpi_ctl, "Rate");
         snd_control.access =
             SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ;
         snd_control.info = snd_asihpi_clkrate_info;
@@ -2571,10 +2567,10 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
 
         if (snd_BUG_ON(!asihpi))
                 return -EINVAL;
-        strcpy(card->mixername, "asihpi mixer");
+        strcpy(card->mixername, "Asihpi Mixer");
 
         err =
-            hpi_mixer_open(ss, asihpi->adapter_index,
+            hpi_mixer_open(asihpi->adapter_index,
                           &asihpi->h_mixer);
         hpi_handle_error(err);
         if (err)
@@ -2585,7 +2581,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
 
         for (idx = 0; idx < 2000; idx++) {
                 err = hpi_mixer_get_control_by_index(
-                                ss, asihpi->h_mixer,
+                                asihpi->h_mixer,
                                 idx,
                                 &hpi_ctl.src_node_type,
                                 &hpi_ctl.src_node_index,
@@ -2597,7 +2593,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
                         if (err == HPI_ERROR_CONTROL_DISABLED) {
                                 if (mixer_dump)
                                         snd_printk(KERN_INFO
-                                                   "disabled HPI control(%d)\n",
+                                                   "Disabled HPI Control(%d)\n",
                                                    idx);
                                 continue;
                         } else
@@ -2662,7 +2658,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
                 default:
                         if (mixer_dump)
                                 snd_printk(KERN_INFO
-                                        "untranslated HPI control"
+                                        "Untranslated HPI Control"
                                         "(%d) %d %d %d %d %d\n",
                                         idx,
                                         hpi_ctl.control_type,
@@ -2712,14 +2708,14 @@ snd_asihpi_proc_read(struct snd_info_entry *entry,
                 version & 0x7,
                 ((version >> 13) * 100) + ((version >> 7) & 0x3f));
 
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err) {
-                err = hpi_sample_clock_get_sample_rate(ss,
+                err = hpi_sample_clock_get_sample_rate(
                                         h_control, &rate);
-                err += hpi_sample_clock_get_source(ss, h_control, &source);
+                err += hpi_sample_clock_get_source(h_control, &source);
 
                 if (!err)
                         snd_iprintf(buffer, "sample_clock=%d_hz, source %s\n",
@@ -2841,15 +2837,17 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 if (err < 0)
                         return err;
                 snd_printk(KERN_WARNING
-                        "**** WARNING **** adapter index %d->ALSA index %d\n",
+                        "**** WARNING **** Adapter index %d->ALSA index %d\n",
                         hpi_card->index, card->number);
         }
 
+        snd_card_set_dev(card, &pci_dev->dev);
+
         asihpi = (struct snd_card_asihpi *) card->private_data;
         asihpi->card = card;
-        asihpi->pci = hpi_card->pci;
+        asihpi->pci = pci_dev;
         asihpi->adapter_index = hpi_card->index;
-        hpi_handle_error(hpi_adapter_get_info(ss,
+        hpi_handle_error(hpi_adapter_get_info(
                                  asihpi->adapter_index,
                                  &asihpi->num_outstreams,
                                  &asihpi->num_instreams,
@@ -2859,7 +2857,7 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
         version = asihpi->version;
         snd_printk(KERN_INFO "adapter ID=%4X index=%d num_outstreams=%d "
                         "num_instreams=%d S/N=%d\n"
-                        "hw version %c%d DSP code version %03d\n",
+                        "Hw Version %c%d DSP code version %03d\n",
                         asihpi->type, asihpi->adapter_index,
                         asihpi->num_outstreams,
                         asihpi->num_instreams, asihpi->serial_number,
@@ -2871,33 +2869,33 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
         if (pcm_substreams < asihpi->num_instreams)
                 pcm_substreams = asihpi->num_instreams;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS1,
                 NULL, &asihpi->support_grouping);
         if (err)
                 asihpi->support_grouping = 0;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CAPS2,
                 &asihpi->support_mrx, NULL);
         if (err)
                 asihpi->support_mrx = 0;
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_INTERVAL,
                 NULL, &asihpi->update_interval_frames);
         if (err)
                 asihpi->update_interval_frames = 512;
 
-        hpi_handle_error(hpi_instream_open(ss, asihpi->adapter_index,
+        hpi_handle_error(hpi_instream_open(asihpi->adapter_index,
                              0, &h_stream));
 
-        err = hpi_instream_host_buffer_free(ss, h_stream);
+        err = hpi_instream_host_buffer_free(h_stream);
         asihpi->support_mmap = (!err);
 
-        hpi_handle_error(hpi_instream_close(ss, h_stream));
+        hpi_handle_error(hpi_instream_close(h_stream));
 
-        err = hpi_adapter_get_property(ss, asihpi->adapter_index,
+        err = hpi_adapter_get_property(asihpi->adapter_index,
                 HPI_ADAPTER_PROPERTY_CURCHANNELS,
                 &asihpi->in_max_chans, &asihpi->out_max_chans);
         if (err) {
@@ -2923,13 +2921,13 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
                 goto __nodev;
         }
 
-        err = hpi_mixer_get_control(ss, asihpi->h_mixer,
+        err = hpi_mixer_get_control(asihpi->h_mixer,
                                   HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
                                   HPI_CONTROL_SAMPLECLOCK, &h_control);
 
         if (!err)
                 err = hpi_sample_clock_set_local_rate(
-                        ss, h_control, adapter_fs);
+                        h_control, adapter_fs);
 
         snd_asihpi_proc_init(asihpi);
 
diff --git a/sound/pci/asihpi/hpi.h b/sound/pci/asihpi/hpi.h
index 23399d02f666..6fc025c448de 100644
--- a/sound/pci/asihpi/hpi.h
+++ b/sound/pci/asihpi/hpi.h
@@ -24,17 +24,10 @@
 
  The HPI is a low-level hardware abstraction layer to all
  AudioScience digital audio adapters
-*/
-/*
- You must define one operating system that the HPI is to be compiled under
- HPI_OS_WIN32_USER   32bit Windows
- HPI_OS_DSP_C6000    DSP TI C6000  (automatically set)
- HPI_OS_WDM          Windows WDM kernel driver
- HPI_OS_LINUX        Linux userspace
- HPI_OS_LINUX_KERNEL Linux kernel (automatically set)
 
 (C) Copyright AudioScience Inc. 1998-2010
-******************************************************************************/
+*/
+
 #ifndef _HPI_H_
 #define _HPI_H_
 /* HPI Version
@@ -50,20 +43,20 @@ i.e 3.05.02 is a development version
 #define HPI_VER_RELEASE(v) ((int)(v & 0xFF))
 
 /* Use single digits for versions less that 10 to avoid octal. */
-#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 4, 1)
-#define HPI_VER_STRING "4.04.01"
+#define HPI_VER HPI_VERSION_CONSTRUCTOR(4L, 6, 0)
+#define HPI_VER_STRING "4.06.00"
 
 /* Library version as documented in hpi-api-versions.txt */
 #define HPI_LIB_VER  HPI_VERSION_CONSTRUCTOR(9, 0, 0)
 
 #include <linux/types.h>
-#define HPI_EXCLUDE_DEPRECATED
+#define HPI_BUILD_EXCLUDE_DEPRECATED
+#define HPI_BUILD_KERNEL_MODE
 
 /******************************************************************************/
-/******************************************************************************/
 /********       HPI API DEFINITIONS                                       *****/
 /******************************************************************************/
-/******************************************************************************/
+
 /*******************************************/
 /**  Audio format types
 \ingroup stream
@@ -174,7 +167,6 @@ The range is +1.0 to -1.0, which corresponds to digital fullscale.
         HPI_FORMAT_UNDEFINED = 0xffff
 };
 
-/******************************************* in/out Stream states */
 /*******************************************/
 /** Stream States
 \ingroup stream
@@ -194,7 +186,7 @@ enum HPI_STREAM_STATES {
                 cards to be ready. */
         HPI_STATE_WAIT = 6
 };
-/******************************************* mixer source node types */
+/*******************************************/
 /** Source node types
 \ingroup mixer
 */
@@ -224,7 +216,7 @@ enum HPI_SOURCENODES {
                 /* AX6 max sourcenode types = 15 */
 };
 
-/******************************************* mixer dest node types */
+/*******************************************/
 /** Destination node types
 \ingroup mixer
 */
@@ -262,11 +254,11 @@ enum HPI_CONTROLS {
         HPI_CONTROL_MUTE = 4,   /*mute control - not used at present. */
         HPI_CONTROL_MULTIPLEXER = 5,    /**< multiplexer control. */
 
-        HPI_CONTROL_AESEBU_TRANSMITTER = 6,     /**< AES/EBU transmitter control. */
-        HPI_CONTROL_AESEBUTX = HPI_CONTROL_AESEBU_TRANSMITTER,
+        HPI_CONTROL_AESEBU_TRANSMITTER = 6, /**< AES/EBU transmitter control */
+        HPI_CONTROL_AESEBUTX = 6,       /* HPI_CONTROL_AESEBU_TRANSMITTER */
 
         HPI_CONTROL_AESEBU_RECEIVER = 7, /**< AES/EBU receiver control. */
-        HPI_CONTROL_AESEBURX = HPI_CONTROL_AESEBU_RECEIVER,
+        HPI_CONTROL_AESEBURX = 7,       /* HPI_CONTROL_AESEBU_RECEIVER */
 
         HPI_CONTROL_LEVEL = 8, /**< level/trim control - works in d_bu. */
         HPI_CONTROL_TUNER = 9,  /**< tuner control. */
@@ -281,7 +273,7 @@ enum HPI_CONTROLS {
         HPI_CONTROL_SAMPLECLOCK = 17,   /**< sample clock control. */
         HPI_CONTROL_MICROPHONE = 18,    /**< microphone control. */
         HPI_CONTROL_PARAMETRIC_EQ = 19, /**< parametric EQ control. */
-        HPI_CONTROL_EQUALIZER = HPI_CONTROL_PARAMETRIC_EQ,
+        HPI_CONTROL_EQUALIZER = 19,     /*HPI_CONTROL_PARAMETRIC_EQ */
 
         HPI_CONTROL_COMPANDER = 20,     /**< compander control. */
         HPI_CONTROL_COBRANET = 21,      /**< cobranet control. */
@@ -296,10 +288,7 @@ enum HPI_CONTROLS {
 /* WARNING types 256 or greater impact bit packing in all AX6 DSP code */
 };
 
-/* Shorthand names that match attribute names */
-
-/******************************************* ADAPTER ATTRIBUTES ****/
-
+/*******************************************/
 /** Adapter properties
 These are used in HPI_AdapterSetProperty() and HPI_AdapterGetProperty()
 \ingroup adapter
@@ -330,12 +319,21 @@ by the driver and is not passed on to the DSP at all.
 Indicates the state of the adapter's SSX2 setting. This setting is stored in
 non-volatile memory on the adapter. A typical call sequence would be to use
 HPI_ADAPTER_PROPERTY_SSX2_SETTING to set SSX2 on the adapter and then to reload
-the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during startup
-and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2 to enable
-SSX2 stream mapping within the kernel level of the driver.
+the driver. The driver would query HPI_ADAPTER_PROPERTY_SSX2_SETTING during
+startup and if SSX2 is set, it would then call HPI_ADAPTER_PROPERTY_ENABLE_SSX2
+to enable SSX2 stream mapping within the kernel level of the driver.
 */
         HPI_ADAPTER_PROPERTY_SSX2_SETTING = 4,
 
+/** Enables/disables PCI(e) IRQ.
+A setting of 0 indicates that no interrupts are being generated. A DSP boot
+this property is set to 0. Setting to a non-zero value specifies the number
+of frames of audio that should be processed between interrupts. This property
+should be set to multiple of the mixer interval as read back from the
+HPI_ADAPTER_PROPERTY_INTERVAL property.
+*/
+        HPI_ADAPTER_PROPERTY_IRQ_RATE = 5,
+
 /** Base number for readonly properties */
         HPI_ADAPTER_PROPERTY_READONLYBASE = 256,
 
@@ -440,21 +438,30 @@ return value is true (1) or false (0). If the current adapter
 mode is MONO SSX2 is disabled, even though this property will
 return true.
 */
-        HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271
+        HPI_ADAPTER_PROPERTY_SUPPORTS_SSX2 = 271,
+/** Readonly supports PCI(e) IRQ.
+Indicates that the adapter in it's current mode supports interrupts
+across the host bus. Note, this does not imply that interrupts are
+enabled. Instead it indicates that they can be enabled.
+*/
+        HPI_ADAPTER_PROPERTY_SUPPORTS_IRQ = 272
 };
 
 /** Adapter mode commands
 
-Used in wQueryOrSet field of HPI_AdapterSetModeEx().
+Used in wQueryOrSet parameter of HPI_AdapterSetModeEx().
 \ingroup adapter
 */
 enum HPI_ADAPTER_MODE_CMDS {
+        /** Set the mode to the given parameter */
         HPI_ADAPTER_MODE_SET = 0,
+        /** Return 0 or error depending whether mode is valid,
+        but don't set the mode */
         HPI_ADAPTER_MODE_QUERY = 1
 };
 
 /** Adapter Modes
-        These are used by HPI_AdapterSetModeEx()
+ These are used by HPI_AdapterSetModeEx()
 
 \warning - more than 16 possible modes breaks
 a bitmask in the Windows WAVE DLL
@@ -629,10 +636,13 @@ enum HPI_MIXER_STORE_COMMAND {
         HPI_MIXER_STORE_SAVE_SINGLE = 6
 };
 
-/************************************* CONTROL ATTRIBUTE VALUES ****/
+/****************************/
+/* CONTROL ATTRIBUTE VALUES */
+/****************************/
+
 /** Used by mixer plugin enable functions
 
-E.g. HPI_ParametricEQ_SetState()
+E.g. HPI_ParametricEq_SetState()
 \ingroup mixer
 */
 enum HPI_SWITCH_STATES {
@@ -641,6 +651,7 @@ enum HPI_SWITCH_STATES {
 };
 
 /* Volume control special gain values */
+
 /** volumes units are 100ths of a dB
 \ingroup volume
 */
@@ -650,6 +661,11 @@ enum HPI_SWITCH_STATES {
 */
 #define HPI_GAIN_OFF                    (-100 * HPI_UNITS_PER_dB)
 
+/** channel mask specifying all channels
+\ingroup volume
+*/
+#define HPI_BITMASK_ALL_CHANNELS        (0xFFFFFFFF)
+
 /** value returned for no signal
 \ingroup meter
 */
@@ -667,7 +683,7 @@ enum HPI_VOLUME_AUTOFADES {
 
 /** The physical encoding format of the AESEBU I/O.
 
-Used in HPI_AESEBU_Transmitter_SetFormat(), HPI_AESEBU_Receiver_SetFormat()
+Used in HPI_Aesebu_Transmitter_SetFormat(), HPI_Aesebu_Receiver_SetFormat()
 along with related Get and Query functions
 \ingroup aestx
 */
@@ -680,7 +696,7 @@ enum HPI_AESEBU_FORMATS {
 
 /** AES/EBU error status bits
 
-Returned by HPI_AESEBU_Receiver_GetErrorStatus()
+Returned by HPI_Aesebu_Receiver_GetErrorStatus()
 \ingroup aesrx
 */
 enum HPI_AESEBU_ERRORS {
@@ -767,14 +783,6 @@ enum HPI_TUNER_MODE_VALUES {
         HPI_TUNER_MODE_RDS_RBDS = 2 /**<  RDS - RBDS mode */
 };
 
-/** Tuner Level settings
-\ingroup tuner
-*/
-enum HPI_TUNER_LEVEL {
-        HPI_TUNER_LEVEL_AVERAGE = 0,
-        HPI_TUNER_LEVEL_RAW = 1
-};
-
 /** Tuner Status Bits
 
 These bitfield values are returned by a call to HPI_Tuner_GetStatus().
@@ -783,13 +791,13 @@ Multiple fields are returned from a single call.
 */
 enum HPI_TUNER_STATUS_BITS {
         HPI_TUNER_VIDEO_COLOR_PRESENT = 0x0001, /**< video color is present. */
-        HPI_TUNER_VIDEO_IS_60HZ = 0x0020,       /**< 60 hz video detected. */
-        HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040,     /**< video HSYNC is missing. */
-        HPI_TUNER_VIDEO_STATUS_VALID = 0x0100,  /**< video status is valid. */
-        HPI_TUNER_PLL_LOCKED = 0x1000,          /**< the tuner's PLL is locked. */
-        HPI_TUNER_FM_STEREO = 0x2000,           /**< tuner reports back FM stereo. */
-        HPI_TUNER_DIGITAL = 0x0200,             /**< tuner reports digital programming. */
-        HPI_TUNER_MULTIPROGRAM = 0x0400         /**< tuner reports multiple programs. */
+        HPI_TUNER_VIDEO_IS_60HZ = 0x0020, /**< 60 hz video detected. */
+        HPI_TUNER_VIDEO_HORZ_SYNC_MISSING = 0x0040, /**< video HSYNC is missing. */
+        HPI_TUNER_VIDEO_STATUS_VALID = 0x0100, /**< video status is valid. */
+        HPI_TUNER_DIGITAL = 0x0200, /**< tuner reports digital programming. */
+        HPI_TUNER_MULTIPROGRAM = 0x0400, /**< tuner reports multiple programs. */
+        HPI_TUNER_PLL_LOCKED = 0x1000, /**< the tuner's PLL is locked. */
+        HPI_TUNER_FM_STEREO = 0x2000 /**< tuner reports back FM stereo. */
 };
 
 /** Channel Modes
@@ -839,7 +847,7 @@ enum HPI_SAMPLECLOCK_SOURCES {
         HPI_SAMPLECLOCK_SOURCE_LAST = 10
 };
 
-/** Equalizer filter types. Used by HPI_ParametricEQ_SetBand()
+/** Equalizer filter types. Used by HPI_ParametricEq_SetBand()
 \ingroup parmeq
 */
 enum HPI_FILTER_TYPE {
@@ -882,7 +890,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_INVALID_OBJ = 101,
         /** Function does not exist. */
         HPI_ERROR_INVALID_FUNC = 102,
-        /** The specified object (adapter/Stream) does not exist. */
+        /** The specified object does not exist. */
         HPI_ERROR_INVALID_OBJ_INDEX = 103,
         /** Trying to access an object that has not been opened yet. */
         HPI_ERROR_OBJ_NOT_OPEN = 104,
@@ -890,8 +898,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_OBJ_ALREADY_OPEN = 105,
         /** PCI, ISA resource not valid. */
         HPI_ERROR_INVALID_RESOURCE = 106,
-        /** GetInfo call from SubSysFindAdapters failed. */
-        HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO = 107,
+        /* HPI_ERROR_SUBSYSFINDADAPTERS_GETINFO= 107 */
         /** Default response was never updated with actual error code. */
         HPI_ERROR_INVALID_RESPONSE = 108,
         /** wSize field of response was not updated,
@@ -899,38 +906,44 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_PROCESSING_MESSAGE = 109,
         /** The network did not respond in a timely manner. */
         HPI_ERROR_NETWORK_TIMEOUT = 110,
-        /** An HPI handle is invalid (uninitialised?). */
+        /* An HPI handle is invalid (uninitialised?). */
         HPI_ERROR_INVALID_HANDLE = 111,
         /** A function or attribute has not been implemented yet. */
         HPI_ERROR_UNIMPLEMENTED = 112,
-        /** There are too many clients attempting to access a network resource. */
+        /** There are too many clients attempting
+            to access a network resource. */
         HPI_ERROR_NETWORK_TOO_MANY_CLIENTS = 113,
-        /** Response buffer passed to HPI_Message was smaller than returned response */
+        /** Response buffer passed to HPI_Message
+            was smaller than returned response.
+            wSpecificError field of hpi response contains the required size.
+        */
         HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL = 114,
         /** The returned response did not match the sent message */
         HPI_ERROR_RESPONSE_MISMATCH = 115,
+        /** A control setting that should have been cached was not. */
+        HPI_ERROR_CONTROL_CACHING = 116,
+        /** A message buffer in the path to the adapter was smaller
+            than the message size.
+            wSpecificError field of hpi response contains the actual size.
+        */
+        HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL = 117,
 
-        /** Too many adapters.*/
-        HPI_ERROR_TOO_MANY_ADAPTERS = 200,
+        /* HPI_ERROR_TOO_MANY_ADAPTERS= 200 */
         /** Bad adpater. */
         HPI_ERROR_BAD_ADAPTER = 201,
         /** Adapter number out of range or not set properly. */
         HPI_ERROR_BAD_ADAPTER_NUMBER = 202,
         /** 2 adapters with the same adapter number. */
-        HPI_DUPLICATE_ADAPTER_NUMBER = 203,
-        /** DSP code failed to bootload. */
+        HPI_ERROR_DUPLICATE_ADAPTER_NUMBER = 203,
+        /** DSP code failed to bootload. (unused?) */
         HPI_ERROR_DSP_BOOTLOAD = 204,
-        /** Adapter failed DSP code self test. */
-        HPI_ERROR_DSP_SELFTEST = 205,
         /** Couldn't find or open the DSP code file. */
         HPI_ERROR_DSP_FILE_NOT_FOUND = 206,
         /** Internal DSP hardware error. */
         HPI_ERROR_DSP_HARDWARE = 207,
-        /** Could not allocate memory in DOS. */
-        HPI_ERROR_DOS_MEMORY_ALLOC = 208,
         /** Could not allocate memory */
         HPI_ERROR_MEMORY_ALLOC = 208,
-        /** Failed to correctly load/config PLD .*/
+        /** Failed to correctly load/config PLD. (unused) */
         HPI_ERROR_PLD_LOAD = 209,
         /** Unexpected end of file, block length too big etc. */
         HPI_ERROR_DSP_FILE_FORMAT = 210,
@@ -939,8 +952,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_DSP_FILE_ACCESS_DENIED = 211,
         /** First DSP code section header not found in DSP file. */
         HPI_ERROR_DSP_FILE_NO_HEADER = 212,
-        /** File read operation on DSP code file failed. */
-        HPI_ERROR_DSP_FILE_READ_ERROR = 213,
+        /* HPI_ERROR_DSP_FILE_READ_ERROR= 213, */
         /** DSP code for adapter family not found. */
         HPI_ERROR_DSP_SECTION_NOT_FOUND = 214,
         /** Other OS specific error opening DSP file. */
@@ -950,23 +962,21 @@ enum HPI_ERROR_CODES {
         /** DSP code section header had size == 0. */
         HPI_ERROR_DSP_FILE_NULL_HEADER = 217,
 
-        /** Base number for flash errors. */
-        HPI_ERROR_FLASH = 220,
+        /* HPI_ERROR_FLASH = 220, */
 
         /** Flash has bad checksum */
-        HPI_ERROR_BAD_CHECKSUM = (HPI_ERROR_FLASH + 1),
-        HPI_ERROR_BAD_SEQUENCE = (HPI_ERROR_FLASH + 2),
-        HPI_ERROR_FLASH_ERASE = (HPI_ERROR_FLASH + 3),
-        HPI_ERROR_FLASH_PROGRAM = (HPI_ERROR_FLASH + 4),
-        HPI_ERROR_FLASH_VERIFY = (HPI_ERROR_FLASH + 5),
-        HPI_ERROR_FLASH_TYPE = (HPI_ERROR_FLASH + 6),
-        HPI_ERROR_FLASH_START = (HPI_ERROR_FLASH + 7),
+        HPI_ERROR_BAD_CHECKSUM = 221,
+        HPI_ERROR_BAD_SEQUENCE = 222,
+        HPI_ERROR_FLASH_ERASE = 223,
+        HPI_ERROR_FLASH_PROGRAM = 224,
+        HPI_ERROR_FLASH_VERIFY = 225,
+        HPI_ERROR_FLASH_TYPE = 226,
+        HPI_ERROR_FLASH_START = 227,
 
         /** Reserved for OEMs. */
         HPI_ERROR_RESERVED_1 = 290,
 
-        /** Stream does not exist. */
-        HPI_ERROR_INVALID_STREAM = 300,
+        /* HPI_ERROR_INVALID_STREAM = 300 use HPI_ERROR_INVALID_OBJ_INDEX */
         /** Invalid compression format. */
         HPI_ERROR_INVALID_FORMAT = 301,
         /** Invalid format samplerate */
@@ -977,21 +987,19 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_INVALID_BITRATE = 304,
         /** Invalid datasize used for stream read/write. */
         HPI_ERROR_INVALID_DATASIZE = 305,
-        /** Stream buffer is full during stream write. */
-        HPI_ERROR_BUFFER_FULL = 306,
-        /** Stream buffer is empty during stream read. */
-        HPI_ERROR_BUFFER_EMPTY = 307,
-        /** Invalid datasize used for stream read/write. */
-        HPI_ERROR_INVALID_DATA_TRANSFER = 308,
+        /* HPI_ERROR_BUFFER_FULL = 306 use HPI_ERROR_INVALID_DATASIZE */
+        /* HPI_ERROR_BUFFER_EMPTY = 307 use HPI_ERROR_INVALID_DATASIZE */
+        /** Null data pointer used for stream read/write. */
+        HPI_ERROR_INVALID_DATA_POINTER = 308,
         /** Packet ordering error for stream read/write. */
         HPI_ERROR_INVALID_PACKET_ORDER = 309,
 
         /** Object can't do requested operation in its current
-        state, eg set format, change rec mux state while recording.*/
+            state, eg set format, change rec mux state while recording.*/
         HPI_ERROR_INVALID_OPERATION = 310,
 
-        /** Where an SRG is shared amongst streams, an incompatible samplerate is one
-        that is different to any currently playing or recording stream. */
+        /** Where a SRG is shared amongst streams, an incompatible samplerate
+            is one that is different to any currently active stream. */
         HPI_ERROR_INCOMPATIBLE_SAMPLERATE = 311,
         /** Adapter mode is illegal.*/
         HPI_ERROR_BAD_ADAPTER_MODE = 312,
@@ -1004,6 +1012,8 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_NO_INTERADAPTER_GROUPS = 314,
         /** Streams on different DSPs cannot be grouped. */
         HPI_ERROR_NO_INTERDSP_GROUPS = 315,
+        /** Stream wait cancelled before threshold reached. */
+        HPI_ERROR_WAIT_CANCELLED = 316,
 
         /** Invalid mixer node for this adapter. */
         HPI_ERROR_INVALID_NODE = 400,
@@ -1017,6 +1027,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_CONTROL_DISABLED = 404,
         /** I2C transaction failed due to a missing ACK. */
         HPI_ERROR_CONTROL_I2C_MISSING_ACK = 405,
+        HPI_ERROR_I2C_MISSING_ACK = 405,
         /** Control is busy, or coming out of
         reset and cannot be accessed at this time. */
         HPI_ERROR_CONTROL_NOT_READY = 407,
@@ -1027,7 +1038,6 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_NVMEM_FAIL = 452,
 
         /** I2C */
-        HPI_ERROR_I2C_MISSING_ACK = HPI_ERROR_CONTROL_I2C_MISSING_ACK,
         HPI_ERROR_I2C_BAD_ADR = 460,
 
         /** Entity errors */
@@ -1035,6 +1045,7 @@ enum HPI_ERROR_CODES {
         HPI_ERROR_ENTITY_ITEM_COUNT = 471,
         HPI_ERROR_ENTITY_TYPE_INVALID = 472,
         HPI_ERROR_ENTITY_ROLE_INVALID = 473,
+        HPI_ERROR_ENTITY_SIZE_MISMATCH = 474,
 
         /* AES18 specific errors were 500..507 */
 
@@ -1044,11 +1055,18 @@ enum HPI_ERROR_CODES {
         /** hpioct32.c can't obtain mutex */
         HPI_ERROR_MUTEX_TIMEOUT = 700,
 
-        /** errors from HPI backends have values >= this */
+        /** Backend errors used to be greater than this.
+            \deprecated Now, all backends return only errors defined here in hpi.h
+        */
         HPI_ERROR_BACKEND_BASE = 900,
 
-        /** indicates a cached u16 value is invalid. */
-        HPI_ERROR_ILLEGAL_CACHE_VALUE = 0xffff
+        /** Communication with DSP failed */
+        HPI_ERROR_DSP_COMMUNICATION = 900
+                /* Note that the dsp communication error is set to this value so that
+                   it remains compatible with any software that expects such errors
+                   to be backend errors i.e. >= 900.
+                   Do not define any new error codes with values > 900.
+                 */
 };
 
 /** \defgroup maximums HPI maximum values
@@ -1075,7 +1093,7 @@ enum HPI_ERROR_CODES {
 
 /**\}*/
 
-/* ////////////////////////////////////////////////////////////////////// */
+/**************/
 /* STRUCTURES */
 #ifndef DISABLE_PRAGMA_PACK1
 #pragma pack(push, 1)
@@ -1092,7 +1110,7 @@ struct hpi_format {
                                 /**< Stereo/JointStereo/Mono */
         u16 mode_legacy;
                                 /**< Legacy ancillary mode or idle bit  */
-        u16 unused;           /**< unused */
+        u16 unused;           /**< Unused */
         u16 channels; /**< 1,2..., (or ancillary mode or idle bit */
         u16 format;   /**< HPI_FORMAT_PCM16, _MPEG etc. see #HPI_FORMATS. */
 };
@@ -1106,930 +1124,594 @@ struct hpi_anc_frame {
 */
 struct hpi_async_event {
         u16 event_type; /**< type of event. \sa async_event  */
-        u16 sequence;  /**< sequence number, allows lost event detection */
-        u32 state;    /**< new state */
-        u32 h_object;    /**< handle to the object returning the event. */
+        u16 sequence; /**< Sequence number, allows lost event detection */
+        u32 state; /**< New state */
+        u32 h_object; /**< handle to the object returning the event. */
         union {
                 struct {
                         u16 index; /**< GPIO bit index. */
                 } gpio;
                 struct {
                         u16 node_index; /**< what node is the control on ? */
-                        u16 node_type;  /**< what type of node is the control on ? */
+                        u16 node_type; /**< what type of node is the control on ? */
                 } control;
         } u;
 };
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* Public HPI Entity related definitions                                     */
-
-struct hpi_entity;
-
-enum e_entity_type {
-        entity_type_null,
-        entity_type_sequence,   /* sequence of potentially heterogeneous TLV entities */
-
-        entity_type_reference,  /* refers to a TLV entity or NULL */
-
-        entity_type_int,        /* 32 bit */
-        entity_type_float,      /* ieee754 binary 32 bit encoding */
-        entity_type_double,
-
-        entity_type_cstring,
-        entity_type_octet,
-        entity_type_ip4_address,
-        entity_type_ip6_address,
-        entity_type_mac_address,
-
-        LAST_ENTITY_TYPE
-};
-
-enum e_entity_role {
-        entity_role_null,
-        entity_role_value,
-        entity_role_classname,
-
-        entity_role_units,
-        entity_role_flags,
-        entity_role_range,
-
-        entity_role_mapping,
-        entity_role_enum,
-
-        entity_role_instance_of,
-        entity_role_depends_on,
-        entity_role_member_of_group,
-        entity_role_value_constraint,
-        entity_role_parameter_port,
-
-        entity_role_block,
-        entity_role_node_group,
-        entity_role_audio_port,
-        entity_role_clock_port,
-        LAST_ENTITY_ROLE
-};
-
 /* skip host side function declarations for
    DSP compile and documentation extraction */
 
-struct hpi_hsubsys {
-        int not_really_used;
-};
-
 #ifndef DISABLE_PRAGMA_PACK1
 #pragma pack(pop)
 #endif
 
-/*////////////////////////////////////////////////////////////////////////// */
+/*****************/
 /* HPI FUNCTIONS */
+/*****************/
 
-/*/////////////////////////// */
-/* DATA and FORMAT and STREAM */
-
+/* Stream */
 u16 hpi_stream_estimate_buffer_size(struct hpi_format *pF,
         u32 host_polling_rate_in_milli_seconds, u32 *recommended_buffer_size);
 
-/*/////////// */
-/* SUB SYSTEM */
-struct hpi_hsubsys *hpi_subsys_create(void
-        );
-
-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys);
-
-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion);
-
-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion_ex);
-
-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);
-
-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length);
-
-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
-        int *pn_num_adapters);
-
-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,
-        u32 *padapter_index, u16 *pw_adapter_type);
-
-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass);
+/*************/
+/* SubSystem */
+/*************/
 
-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,
-        const char *sz_interface);
+u16 hpi_subsys_get_version_ex(u32 *pversion_ex);
 
-/*///////// */
-/* ADAPTER */
+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters);
 
-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);
+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,
+        u16 *pw_adapter_type);
 
-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index);
+/***********/
+/* Adapter */
+/***********/
 
-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,
-        u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type);
+u16 hpi_adapter_open(u16 adapter_index);
 
-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 module_index, u16 *pw_num_outputs,
-        u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,
-        u16 *pw_module_type, u32 *ph_module);
+u16 hpi_adapter_close(u16 adapter_index);
 
-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode);
+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,
+        u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,
+        u16 *pw_adapter_type);
 
-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode, u16 query_or_set);
-
-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *padapter_mode);
-
-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u16 *pw_line_number);
-
-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u32 *pline_number, u16 *pw_assert_on_dsp);
-
-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 assert_id);
-
-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 capability, u32 key);
-
-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index);
-
-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 dsp_address, char *p_bytes, int *count_bytes);
-
-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 paramter1, u16 paramter2);
-
-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 *pw_paramter1,
-        u16 *pw_paramter2);
-
-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 index, u16 what_to_enumerate,
-        u16 property_index, u32 *psetting);
-
-/*////////////// */
-/* NonVol Memory */
-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_nv_memory, u16 *pw_size_in_bytes);
-
-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 *pw_data);
-
-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 data);
-
-/*////////////// */
-/* Digital I/O */
-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits);
-
-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 *pw_bit_data);
-
-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        );
+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,
+        u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,
+        u32 *pserial_number, u16 *pw_module_type, u32 *ph_module);
 
-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 bit_data);
+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode);
 
-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        );
+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,
+        u16 query_or_set);
 
-/**********************/
-/* Async Event Object */
-/**********************/
-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *ph_async);
+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode);
 
-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async);
+u16 hpi_adapter_get_assert2(u16 adapter_index, u16 *p_assert_count,
+        char *psz_assert, u32 *p_param1, u32 *p_param2,
+        u32 *p_dsp_string_addr, u16 *p_processor_id);
 
-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned);
+u16 hpi_adapter_test_assert(u16 adapter_index, u16 assert_id);
 
-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,
-        u32 h_async, u16 *pw_count);
+u16 hpi_adapter_enable_capability(u16 adapter_index, u16 capability, u32 key);
 
-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned);
+u16 hpi_adapter_self_test(u16 adapter_index);
 
-/*/////////// */
-/* WATCH-DOG  */
-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_watchdog);
+u16 hpi_adapter_debug_read(u16 adapter_index, u32 dsp_address, char *p_bytes,
+        int *count_bytes);
 
-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,
-        u32 time_millisec);
+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 paramter1,
+        u16 paramter2);
 
-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog);
+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,
+        u16 *pw_paramter1, u16 *pw_paramter2);
 
-/**************/
-/* OUT STREAM */
-/**************/
-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 outstream_index, u32 *ph_outstream);
+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,
+        u16 what_to_enumerate, u16 property_index, u32 *psetting);
+/*************/
+/* OutStream */
+/*************/
+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,
+        u32 *ph_outstream);
 
-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_close(u32 h_outstream);
 
-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,
-        u32 *psamples_played, u32 *pauxiliary_data_to_play);
+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,
+        u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,
+        u32 *pauxiliary_data_to_play);
 
-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, const u8 *pb_write_buf, u32 bytes_to_write,
-        const struct hpi_format *p_format);
+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_write_buf,
+        u32 bytes_to_write, const struct hpi_format *p_format);
 
-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_start(u32 h_outstream);
 
-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_wait_start(u32 h_outstream);
 
-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_stop(u32 h_outstream);
 
-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_sinegen(u32 h_outstream);
 
-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream);
+u16 hpi_outstream_reset(u32 h_outstream);
 
-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format);
+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format);
 
-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format);
+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format);
 
-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample);
+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,
+        u32 punch_out_sample);
 
-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, short velocity);
+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity);
 
-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 mode);
+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode);
 
-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *pframes_available);
+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available);
 
-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_outstream_ancillary_read(u32 h_outstream,
+        struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_read);
 
-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 time_scaleX10000);
+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scaleX10000);
 
-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 size_in_bytes);
+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes);
 
-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_host_buffer_free(u32 h_outstream);
 
-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 h_stream);
+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream);
 
-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map);
+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,
+        u32 *pinstream_map);
 
-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream);
+u16 hpi_outstream_group_reset(u32 h_outstream);
 
-/*////////// */
-/* IN_STREAM */
-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 instream_index, u32 *ph_instream);
+/************/
+/* InStream */
+/************/
+u16 hpi_instream_open(u16 adapter_index, u16 instream_index,
+        u32 *ph_instream);
 
-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_close(u32 h_instream);
 
-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format);
+u16 hpi_instream_query_format(u32 h_instream,
+        const struct hpi_format *p_format);
 
-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format);
+u16 hpi_instream_set_format(u32 h_instream,
+        const struct hpi_format *p_format);
 
-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
-        u8 *pb_read_buf, u32 bytes_to_read);
+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_read_buf, u32 bytes_to_read);
 
-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_start(u32 h_instream);
 
-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_wait_start(u32 h_instream);
 
-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_stop(u32 h_instream);
 
-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream);
+u16 hpi_instream_reset(u32 h_instream);
 
-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,
-        u32 *psamples_recorded, u32 *pauxiliary_data_recorded);
+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,
+        u32 *pdata_recorded, u32 *psamples_recorded,
+        u32 *pauxiliary_data_recorded);
 
-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,
-        u16 idle_bit);
+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,
+        u16 mode, u16 alignment, u16 idle_bit);
 
-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *pframe_space);
+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space);
 
-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_instream_ancillary_write(u32 h_instream,
+        const struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_write);
 
-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 size_in_bytes);
+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes);
 
-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_host_buffer_free(u32 h_instream);
 
-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 h_stream);
+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream);
 
-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *poutstream_map, u32 *pinstream_map);
+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,
+        u32 *pinstream_map);
 
-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream);
+u16 hpi_instream_group_reset(u32 h_instream);
 
 /*********/
-/* MIXER */
+/* Mixer */
 /*********/
-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_mixer);
-
-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer);
-
-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,
-        u16 dst_node_type_index, u16 control_type, u32 *ph_control);
-
-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_mixer, u16 control_index, u16 *pw_src_node_type,
-        u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,
-        u16 *pw_control_type, u32 *ph_control);
-
-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        enum HPI_MIXER_STORE_COMMAND command, u16 index);
-/*************************/
-/* mixer CONTROLS                */
-/*************************/
-/*************************/
-/* volume control                */
-/*************************/
-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer);
+
+u16 hpi_mixer_close(u32 h_mixer);
+
+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,
+        u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,
+        u16 control_type, u32 *ph_control);
+
+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,
+        u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,
+        u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control);
+
+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,
+        u16 index);
+/************/
+/* Controls */
+/************/
+/******************/
+/* Volume control */
+/******************/
+u16 hpi_volume_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_get_gain(u32 h_control,
         short an_gain0_01dB_out[HPI_MAX_CHANNELS]
         );
 
+u16 hpi_volume_set_mute(u32 h_control, u32 mute);
+
+u16 hpi_volume_get_mute(u32 h_control, u32 *mute);
+
 #define hpi_volume_get_range hpi_volume_query_range
-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);
+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB);
 
-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_volume, u32 *p_channels);
+u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels);
 
-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_auto_fade(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms);
 
-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],
-        u32 duration_ms, u16 profile);
+u16 hpi_volume_auto_fade_profile(u32 h_control,
+        short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,
+        u16 profile);
 
-/*************************/
-/* level control         */
-/*************************/
-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB);
+/*****************/
+/* Level control */
+/*****************/
+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB);
 
-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_level_get_gain(u32 h_control,
         short an_gain0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-/*************************/
-/* meter control                 */
-/*************************/
-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_meter, u32 *p_channels);
+/*****************/
+/* Meter control */
+/*****************/
+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels);
 
-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_meter_get_peak(u32 h_control,
         short an_peak0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_peak0_01dB_out[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_rms(u32 h_control, short an_peak0_01dB_out[HPI_MAX_CHANNELS]
         );
 
-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay);
+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay);
 
-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay);
+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay);
 
-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *attack, u16 *decay);
+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *attack, u16 *decay);
 
-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *attack, u16 *decay);
+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *attack, u16 *decay);
 
-/*************************/
-/* channel mode control  */
-/*************************/
-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_mode, const u32 index, u16 *pw_mode);
+/************************/
+/* ChannelMode control */
+/************************/
+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,
+        u16 *pw_mode);
 
-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 mode);
+u16 hpi_channel_mode_set(u32 h_control, u16 mode);
 
-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *mode);
+u16 hpi_channel_mode_get(u32 h_control, u16 *mode);
 
-/*************************/
-/* Tuner control                 */
-/*************************/
-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_band);
+/*****************/
+/* Tuner control */
+/*****************/
+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band);
 
-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 band);
+u16 hpi_tuner_set_band(u32 h_control, u16 band);
 
-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_band);
+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band);
 
-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq);
+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pfreq);
 
-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 freq_ink_hz);
+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz);
 
-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pw_freq_ink_hz);
+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz);
 
-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pw_level);
+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level);
 
-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pw_level);
+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level);
 
-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_gain);
+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain);
 
-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short gain);
+u16 hpi_tuner_set_gain(u32 h_control, short gain);
 
-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pn_gain);
+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain);
 
-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_status_mask, u16 *pw_status);
+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status);
 
-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 value);
+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value);
 
-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 *pn_value);
+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value);
 
-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *p_rds_data);
+u16 hpi_tuner_get_rds(u32 h_control, char *p_rds_data);
 
-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis);
+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pdeemphasis);
 
-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 deemphasis);
-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pdeemphasis);
+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis);
+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis);
 
-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, u32 *pbitmap_program);
+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program);
 
-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 program);
+u16 hpi_tuner_set_program(u32 h_control, u32 program);
 
-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *pprogram);
+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram);
 
-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_dsp_version, const u32 string_size);
+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,
+        const u32 string_size);
 
-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_sdk_version, const u32 string_size);
+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,
+        const u32 string_size);
 
-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pquality);
+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality);
 
-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pblend);
+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend);
 
-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 blend);
+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend);
 
-/****************************/
-/* PADs control             */
-/****************************/
+/***************/
+/* PAD control */
+/***************/
 
-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_string, const u32 string_length);
+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_artist(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_title(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 string_length);
+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,
+        const u32 string_length);
 
-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *ppTY);
+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY);
 
-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *ppI);
+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI);
 
-u16 HPI_PAD__get_program_type_string(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 data_type, const u32 pTY, char *psz_string,
-        const u32 string_length);
+u16 hpi_pad_get_program_type_string(u32 h_control, const u32 data_type,
+        const u32 pTY, char *psz_string, const u32 string_length);
 
 /****************************/
 /* AES/EBU Receiver control */
 /****************************/
-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_rx, const u32 index, u16 *pw_format);
+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,
+        u16 *pw_format);
 
-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source);
+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 source);
 
-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source);
+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_source);
 
-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate);
 
-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data);
 
-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data);
 
-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_error_data);
+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data);
 
 /*******************************/
 /* AES/EBU Transmitter control */
 /*******************************/
-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 sample_rate);
+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate);
 
-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 data);
+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data);
 
-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 data);
+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,
+        u16 data);
 
-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data);
+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data);
 
-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_tx, const u32 index, u16 *pw_format);
+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,
+        u16 *pw_format);
 
-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 output_format);
+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format);
 
-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_output_format);
+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format);
 
 /***********************/
-/* multiplexer control */
+/* Multiplexer control */
 /***********************/
-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_node_type, u16 source_node_index);
-
-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *source_node_type, u16 *source_node_index);
+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,
+        u16 source_node_index);
 
-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *source_node_type,
+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,
         u16 *source_node_index);
 
+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,
+        u16 *source_node_type, u16 *source_node_index);
+
 /***************/
-/* VOX control */
+/* Vox control */
 /***************/
-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB);
+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB);
 
-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *an_gain0_01dB);
+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB);
 
 /*********************/
 /* Bitstream control */
 /*********************/
-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 edge_type);
+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type);
 
-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 polarity);
+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity);
 
-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity);
+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,
+        u16 *pw_data_activity);
 
 /***********************/
 /* SampleClock control */
 /***********************/
 
-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u16 *pw_source);
+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,
+        u16 *pw_source);
 
-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source);
+u16 hpi_sample_clock_set_source(u32 h_control, u16 source);
 
-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source);
+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source);
 
-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, const u32 source,
-        u16 *pw_source_index);
+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,
+        const u32 source, u16 *pw_source_index);
 
-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_index);
+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index);
 
-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source_index);
+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index);
 
-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate);
 
-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u32 *psource);
+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,
+        u32 *psource);
 
-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 sample_rate);
+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate);
 
-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate);
+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate);
 
-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable);
+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable);
 
-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *penable);
+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable);
 
-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 lock);
+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock);
 
-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *plock);
+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock);
 
 /***********************/
 /* Microphone control */
 /***********************/
-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off);
+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off);
 
-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_on_off);
+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off);
 
-/*******************************
-  Parametric Equalizer control
-*******************************/
-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_number_of_bands, u16 *pw_enabled);
+/********************************/
+/* Parametric Equalizer control */
+/********************************/
+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,
+        u16 *pw_enabled);
 
-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off);
+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off);
 
-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,
-        short gain0_01dB);
+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,
+        u32 frequency_hz, short q100, short gain0_01dB);
 
-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,
-        short *pnQ100, short *pn_gain0_01dB);
+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,
+        u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB);
 
-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, short coeffs[5]
+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]
         );
 
-/*******************************
-  Compressor Expander control
-*******************************/
-
-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 on);
-
-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pon);
-
-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short makeup_gain0_01dB);
-
-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pn_makeup_gain0_01dB);
-
-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 index, u32 attack);
-
-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 index, u32 *pw_attack);
-
-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 decay);
-
-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *pw_decay);
-
-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, short threshold0_01dB);
-
-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, short *pn_threshold0_01dB);
-
-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 ratio100);
-
-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *pw_ratio100);
-
-/*******************************
-  Cobranet HMI control
-*******************************/
-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 byte_count, u8 *pb_data);
-
-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data);
-
-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pstatus, u32 *preadable_size,
-        u32 *pwriteable_size);
-
-/*Read the current IP address
-*/
-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress);
-
-/* Write the current IP address
-*/
-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress);
-
-/* Read the static IP address
-*/
-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress);
+/*******************************/
+/* Compressor Expander control */
+/*******************************/
 
-/* Write the static IP address
-*/
-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress);
+u16 hpi_compander_set_enable(u32 h_control, u32 on);
 
-/* Read the MAC address
-*/
-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs);
+u16 hpi_compander_get_enable(u32 h_control, u32 *pon);
 
-/*******************************
-  Tone Detector control
-*******************************/
-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 *state);
+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB);
 
-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 enable);
+u16 hpi_compander_get_makeup_gain(u32 h_control, short *pn_makeup_gain0_01dB);
 
-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        u32 *enable);
+u16 hpi_compander_set_attack_time_constant(u32 h_control, u32 index,
+        u32 attack);
 
-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 event_enable);
+u16 hpi_compander_get_attack_time_constant(u32 h_control, u32 index,
+        u32 *pw_attack);
 
-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *event_enable);
+u16 hpi_compander_set_decay_time_constant(u32 h_control, u32 index,
+        u32 decay);
 
-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int threshold);
+u16 hpi_compander_get_decay_time_constant(u32 h_control, u32 index,
+        u32 *pw_decay);
 
-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int *threshold);
+u16 hpi_compander_set_threshold(u32 h_control, u32 index,
+        short threshold0_01dB);
 
-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 index, u32 *frequency);
+u16 hpi_compander_get_threshold(u32 h_control, u32 index,
+        short *pn_threshold0_01dB);
 
-/*******************************
-  Silence Detector control
-*******************************/
-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *state);
+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100);
 
-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 enable);
+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *pw_ratio100);
 
-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *enable);
+/********************/
+/* Cobranet control */
+/********************/
+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,
+        u8 *pb_data);
 
-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 event_enable);
+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,
+        u32 *pbyte_count, u8 *pb_data);
 
-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *event_enable);
+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,
+        u32 *preadable_size, u32 *pwriteable_size);
 
-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 delay);
+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address);
 
-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, u32 *delay);
+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address);
 
-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int threshold);
+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address);
 
-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 hC, int *threshold);
+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address);
 
-/*******************************
-  Universal control
-*******************************/
-u16 hpi_entity_find_next(struct hpi_entity *container_entity,
-        enum e_entity_type type, enum e_entity_role role, int recursive_flag,
-        struct hpi_entity **current_match);
+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,
+        u32 *p_mac_lsbs);
 
-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,
-        enum e_entity_type type, size_t item_count, void *value_dst_p);
+/*************************/
+/* Tone Detector control */
+/*************************/
+u16 hpi_tone_detector_get_state(u32 hC, u32 *state);
 
-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,
-        size_t *items, enum e_entity_role *role, void **value);
+u16 hpi_tone_detector_set_enable(u32 hC, u32 enable);
 
-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,
-        const size_t item_count, const enum e_entity_role role, void *value,
-        struct hpi_entity **entity);
+u16 hpi_tone_detector_get_enable(u32 hC, u32 *enable);
 
-void hpi_entity_free(struct hpi_entity *entity);
+u16 hpi_tone_detector_set_event_enable(u32 hC, u32 event_enable);
 
-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **info);
+u16 hpi_tone_detector_get_event_enable(u32 hC, u32 *event_enable);
 
-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **value);
+u16 hpi_tone_detector_set_threshold(u32 hC, int threshold);
 
-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity *value);
+u16 hpi_tone_detector_get_threshold(u32 hC, int *threshold);
 
-/*/////////// */
-/* DSP CLOCK  */
-/*/////////// */
-u16 hpi_clock_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_dsp_clock);
+u16 hpi_tone_detector_get_frequency(u32 hC, u32 index, u32 *frequency);
 
-u16 hpi_clock_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,
-        u16 hour, u16 minute, u16 second, u16 milli_second);
+/****************************/
+/* Silence Detector control */
+/****************************/
+u16 hpi_silence_detector_get_state(u32 hC, u32 *state);
 
-u16 hpi_clock_get_time(const struct hpi_hsubsys *ph_subsys, u32 h_clock,
-        u16 *pw_hour, u16 *pw_minute, u16 *pw_second, u16 *pw_milli_second);
+u16 hpi_silence_detector_set_enable(u32 hC, u32 enable);
 
-/*/////////// */
-/* PROFILE        */
-/*/////////// */
-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 profile_index, u32 *ph_profile,
-        u16 *pw_max_profiles);
+u16 hpi_silence_detector_get_enable(u32 hC, u32 *enable);
 
-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,
-        u32 *pmax_micro_seconds, u32 *pmin_micro_seconds);
+u16 hpi_silence_detector_set_event_enable(u32 hC, u32 event_enable);
 
-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);
+u16 hpi_silence_detector_get_event_enable(u32 hC, u32 *event_enable);
 
-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile);
+u16 hpi_silence_detector_set_delay(u32 hC, u32 delay);
 
-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 index, char *sz_profile_name, u16 profile_name_length);
+u16 hpi_silence_detector_get_delay(u32 hC, u32 *delay);
 
-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,
-        u32 h_profile, u32 *putilization);
+u16 hpi_silence_detector_set_threshold(u32 hC, int threshold);
 
-/*//////////////////// */
-/* UTILITY functions */
+u16 hpi_silence_detector_get_threshold(u32 hC, int *threshold);
+/*********************/
+/* Utility functions */
+/*********************/
 
 u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         u32 sample_rate, u32 bit_rate, u32 attributes);
 
-/* Until it's verified, this function is for Windows OSs only */
-
-#endif   /*_H_HPI_ */
-/*
-///////////////////////////////////////////////////////////////////////////////
-// See CVS for history.  Last complete set in rev 1.146
-////////////////////////////////////////////////////////////////////////////////
-*/
+#endif   /*_HPI_H_ */
diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 1b9bf9395cfe..3e3c2ef6efd8 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -43,16 +43,17 @@
 #define HPI_HIF_ERROR_MASK      0x4000
 
 /* HPI6000 specific error codes */
+#define HPI6000_ERROR_BASE 900  /* not actually used anywhere */
 
-#define HPI6000_ERROR_BASE                              900
+/* operational/messaging errors */
 #define HPI6000_ERROR_MSG_RESP_IDLE_TIMEOUT             901
-#define HPI6000_ERROR_MSG_RESP_SEND_MSG_ACK             902
+
 #define HPI6000_ERROR_MSG_RESP_GET_RESP_ACK             903
 #define HPI6000_ERROR_MSG_GET_ADR                       904
 #define HPI6000_ERROR_RESP_GET_ADR                      905
 #define HPI6000_ERROR_MSG_RESP_BLOCKWRITE32             906
 #define HPI6000_ERROR_MSG_RESP_BLOCKREAD32              907
-#define HPI6000_ERROR_MSG_INVALID_DSP_INDEX             908
+
 #define HPI6000_ERROR_CONTROL_CACHE_PARAMS              909
 
 #define HPI6000_ERROR_SEND_DATA_IDLE_TIMEOUT            911
@@ -62,7 +63,6 @@
 #define HPI6000_ERROR_SEND_DATA_CMD                     915
 #define HPI6000_ERROR_SEND_DATA_WRITE                   916
 #define HPI6000_ERROR_SEND_DATA_IDLECMD                 917
-#define HPI6000_ERROR_SEND_DATA_VERIFY                  918
 
 #define HPI6000_ERROR_GET_DATA_IDLE_TIMEOUT             921
 #define HPI6000_ERROR_GET_DATA_ACK                      922
@@ -76,9 +76,8 @@
 
 #define HPI6000_ERROR_MSG_RESP_GETRESPCMD               961
 #define HPI6000_ERROR_MSG_RESP_IDLECMD                  962
-#define HPI6000_ERROR_MSG_RESP_BLOCKVERIFY32            963
 
-/* adapter init errors */
+/* Initialisation/bootload errors */
 #define HPI6000_ERROR_UNHANDLED_SUBSYS_ID               930
 
 /* can't access PCI2040 */
@@ -210,6 +209,8 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 *pos_error_code);
 
+static void delete_adapter_obj(struct hpi_adapter_obj *pao);
+
 /* local globals */
 
 static u16 gw_pci_read_asserts; /* used to count PCI2040 errors */
@@ -217,17 +218,7 @@ static u16 gw_pci_write_asserts;	/* used to count PCI2040 errors */
 
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
-        case HPI_SUBSYS_OPEN:
-        case HPI_SUBSYS_CLOSE:
-        case HPI_SUBSYS_GET_INFO:
-        case HPI_SUBSYS_DRIVER_UNLOAD:
-        case HPI_SUBSYS_DRIVER_LOAD:
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                /* messages that should not get here */
-                phr->error = HPI_ERROR_UNIMPLEMENTED;
-                break;
         case HPI_SUBSYS_CREATE_ADAPTER:
                 subsys_create_adapter(phm, phr);
                 break;
@@ -243,7 +234,6 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 static void control_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
@@ -251,7 +241,13 @@ static void control_message(struct hpi_adapter_obj *pao,
                         err = hpi6000_update_control_cache(pao, phm);
 
                         if (err) {
-                                phr->error = err;
+                                if (err >= HPI_ERROR_BACKEND_BASE) {
+                                        phr->error =
+                                                HPI_ERROR_CONTROL_CACHING;
+                                        phr->specific_error = err;
+                                } else {
+                                        phr->error = err;
+                                }
                                 break;
                         }
 
@@ -262,16 +258,15 @@ static void control_message(struct hpi_adapter_obj *pao,
                 }
                 hw_message(pao, phm, phr);
                 break;
-        case HPI_CONTROL_GET_INFO:
-                hw_message(pao, phm, phr);
-                break;
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
-                hpi_sync_control_cache(((struct hpi_hw_obj *)pao->priv)->
-                        p_cache, phm, phr);
+                hpi_cmn_control_cache_sync_to_msg(((struct hpi_hw_obj *)pao->
+                                priv)->p_cache, phm, phr);
                 break;
+
+        case HPI_CONTROL_GET_INFO:
         default:
-                phr->error = HPI_ERROR_INVALID_FUNC;
+                hw_message(pao, phm, phr);
                 break;
         }
 }
@@ -280,26 +275,12 @@ static void adapter_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
         switch (phm->function) {
-        case HPI_ADAPTER_GET_INFO:
-                hw_message(pao, phm, phr);
-                break;
         case HPI_ADAPTER_GET_ASSERT:
                 adapter_get_asserts(pao, phm, phr);
                 break;
-        case HPI_ADAPTER_OPEN:
-        case HPI_ADAPTER_CLOSE:
-        case HPI_ADAPTER_TEST_ASSERT:
-        case HPI_ADAPTER_SELFTEST:
-        case HPI_ADAPTER_GET_MODE:
-        case HPI_ADAPTER_SET_MODE:
-        case HPI_ADAPTER_FIND_OBJECT:
-        case HPI_ADAPTER_GET_PROPERTY:
-        case HPI_ADAPTER_SET_PROPERTY:
-        case HPI_ADAPTER_ENUM_PROPERTY:
-                hw_message(pao, phm, phr);
-                break;
+
         default:
-                phr->error = HPI_ERROR_INVALID_FUNC;
+                hw_message(pao, phm, phr);
                 break;
         }
 }
@@ -311,7 +292,7 @@ static void outstream_message(struct hpi_adapter_obj *pao,
         case HPI_OSTREAM_HOSTBUFFER_ALLOC:
         case HPI_OSTREAM_HOSTBUFFER_FREE:
                 /* Don't let these messages go to the HW function because
-                 * they're called without allocating the spinlock.
+                 * they're called without locking the spinlock.
                  * For the HPI6000 adapters the HW would return
                  * HPI_ERROR_INVALID_FUNC anyway.
                  */
@@ -331,7 +312,7 @@ static void instream_message(struct hpi_adapter_obj *pao,
         case HPI_ISTREAM_HOSTBUFFER_ALLOC:
         case HPI_ISTREAM_HOSTBUFFER_FREE:
                 /* Don't let these messages go to the HW function because
-                 * they're called without allocating the spinlock.
+                 * they're called without locking the spinlock.
                  * For the HPI6000 adapters the HW would return
                  * HPI_ERROR_INVALID_FUNC anyway.
                  */
@@ -355,7 +336,7 @@ void HPI_6000(struct hpi_message *phm, struct hpi_response *phr)
         /* subsytem messages get executed by every HPI. */
         /* All other messages are ignored unless the adapter index matches */
         /* an adapter in the HPI */
-        HPI_DEBUG_LOG(DEBUG, "O %d,F %x\n", phm->object, phm->function);
+        /*HPI_DEBUG_LOG(DEBUG, "O %d,F %x\n", phm->wObject, phm->wFunction); */
 
         /* if Dsp has crashed then do not communicate with it any more */
         if (phm->object != HPI_OBJ_SUBSYSTEM) {
@@ -433,21 +414,13 @@ static void subsys_create_adapter(struct hpi_message *phm,
         struct hpi_adapter_obj ao;
         struct hpi_adapter_obj *pao;
         u32 os_error_code;
-        short error = 0;
+        u16 err = 0;
         u32 dsp_index = 0;
 
         HPI_DEBUG_LOG(VERBOSE, "subsys_create_adapter\n");
 
         memset(&ao, 0, sizeof(ao));
 
-        /* this HPI only creates adapters for TI/PCI2040 based devices */
-        if (phm->u.s.resource.bus_type != HPI_BUS_PCI)
-                return;
-        if (phm->u.s.resource.r.pci->vendor_id != HPI_PCI_VENDOR_ID_TI)
-                return;
-        if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_PCI2040)
-                return;
-
         ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
         if (!ao.priv) {
                 HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
@@ -456,16 +429,19 @@ static void subsys_create_adapter(struct hpi_message *phm,
         }
 
         /* create the adapter object based on the resource information */
-        /*? memcpy(&ao.Pci,&phm->u.s.Resource.r.Pci,sizeof(ao.Pci)); */
         ao.pci = *phm->u.s.resource.r.pci;
 
-        error = create_adapter_obj(&ao, &os_error_code);
-        if (!error)
-                error = hpi_add_adapter(&ao);
-        if (error) {
+        err = create_adapter_obj(&ao, &os_error_code);
+        if (err) {
+                delete_adapter_obj(&ao);
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_BOOTLOAD;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+
                 phr->u.s.data = os_error_code;
-                kfree(ao.priv);
-                phr->error = error;
                 return;
         }
         /* need to update paParentAdapter */
@@ -473,7 +449,7 @@ static void subsys_create_adapter(struct hpi_message *phm,
         if (!pao) {
                 /* We just added this adapter, why can't we find it!? */
                 HPI_DEBUG_LOG(ERROR, "lost adapter after boot\n");
-                phr->error = 950;
+                phr->error = HPI_ERROR_BAD_ADAPTER;
                 return;
         }
 
@@ -482,9 +458,8 @@ static void subsys_create_adapter(struct hpi_message *phm,
                 phw->ado[dsp_index].pa_parent_adapter = pao;
         }
 
-        phr->u.s.aw_adapter_list[ao.index] = ao.adapter_type;
+        phr->u.s.adapter_type = ao.adapter_type;
         phr->u.s.adapter_index = ao.index;
-        phr->u.s.num_adapters++;
         phr->error = 0;
 }
 
@@ -492,20 +467,13 @@ static void subsys_delete_adapter(struct hpi_message *phm,
         struct hpi_response *phr)
 {
         struct hpi_adapter_obj *pao = NULL;
-        struct hpi_hw_obj *phw;
 
-        pao = hpi_find_adapter(phm->adapter_index);
+        pao = hpi_find_adapter(phm->obj_index);
         if (!pao)
                 return;
 
-        phw = (struct hpi_hw_obj *)pao->priv;
-
-        if (pao->has_control_cache)
-                hpi_free_control_cache(phw->p_cache);
-
+        delete_adapter_obj(pao);
         hpi_delete_adapter(pao);
-        kfree(phw);
-
         phr->error = 0;
 }
 
@@ -519,9 +487,6 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 control_cache_count = 0;
         struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
 
-        /* init error reporting */
-        pao->dsp_crashed = 0;
-
         /* The PCI2040 has the following address map */
         /* BAR0 - 4K = HPI control and status registers on PCI2040 (HPI CSR) */
         /* BAR1 - 32K = HPI registers on DSP */
@@ -575,36 +540,36 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         /* get info about the adapter by asking the adapter */
         /* send a HPI_ADAPTER_GET_INFO message */
         {
-                struct hpi_message hM;
-                struct hpi_response hR0;        /* response from DSP 0 */
-                struct hpi_response hR1;        /* response from DSP 1 */
+                struct hpi_message hm;
+                struct hpi_response hr0;        /* response from DSP 0 */
+                struct hpi_response hr1;        /* response from DSP 1 */
                 u16 error = 0;
 
                 HPI_DEBUG_LOG(VERBOSE, "send ADAPTER_GET_INFO\n");
-                memset(&hM, 0, sizeof(hM));
-                hM.type = HPI_TYPE_MESSAGE;
-                hM.size = sizeof(struct hpi_message);
-                hM.object = HPI_OBJ_ADAPTER;
-                hM.function = HPI_ADAPTER_GET_INFO;
-                hM.adapter_index = 0;
-                memset(&hR0, 0, sizeof(hR0));
-                memset(&hR1, 0, sizeof(hR1));
-                hR0.size = sizeof(hR0);
-                hR1.size = sizeof(hR1);
-
-                error = hpi6000_message_response_sequence(pao, 0, &hM, &hR0);
-                if (hR0.error) {
-                        HPI_DEBUG_LOG(DEBUG, "message error %d\n", hR0.error);
-                        return hR0.error;
+                memset(&hm, 0, sizeof(hm));
+                hm.type = HPI_TYPE_MESSAGE;
+                hm.size = sizeof(struct hpi_message);
+                hm.object = HPI_OBJ_ADAPTER;
+                hm.function = HPI_ADAPTER_GET_INFO;
+                hm.adapter_index = 0;
+                memset(&hr0, 0, sizeof(hr0));
+                memset(&hr1, 0, sizeof(hr1));
+                hr0.size = sizeof(hr0);
+                hr1.size = sizeof(hr1);
+
+                error = hpi6000_message_response_sequence(pao, 0, &hm, &hr0);
+                if (hr0.error) {
+                        HPI_DEBUG_LOG(DEBUG, "message error %d\n", hr0.error);
+                        return hr0.error;
                 }
                 if (phw->num_dsp == 2) {
-                        error = hpi6000_message_response_sequence(pao, 1, &hM,
-                                &hR1);
+                        error = hpi6000_message_response_sequence(pao, 1, &hm,
+                                &hr1);
                         if (error)
                                 return error;
                 }
-                pao->adapter_type = hR0.u.a.adapter_type;
-                pao->index = hR0.u.a.adapter_index;
+                pao->adapter_type = hr0.u.ax.info.adapter_type;
+                pao->index = hr0.u.ax.info.adapter_index;
         }
 
         memset(&phw->control_cache[0], 0,
@@ -618,22 +583,37 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                 control_cache_count =
                         hpi_read_word(&phw->ado[0],
                         HPI_HIF_ADDR(control_cache_count));
-                pao->has_control_cache = 1;
 
                 phw->p_cache =
                         hpi_alloc_control_cache(control_cache_count,
-                        control_cache_size, (struct hpi_control_cache_info *)
+                        control_cache_size, (unsigned char *)
                         &phw->control_cache[0]
                         );
-                if (!phw->p_cache)
-                        pao->has_control_cache = 0;
-        } else
-                pao->has_control_cache = 0;
+                if (phw->p_cache)
+                        pao->has_control_cache = 1;
+        }
 
         HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n",
                 pao->adapter_type, pao->index);
         pao->open = 0;  /* upon creation the adapter is closed */
-        return 0;
+
+        if (phw->p_cache)
+                phw->p_cache->adap_idx = pao->index;
+
+        return hpi_add_adapter(pao);
+}
+
+static void delete_adapter_obj(struct hpi_adapter_obj *pao)
+{
+        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+
+        if (pao->has_control_cache)
+                hpi_free_control_cache(phw->p_cache);
+
+        /* reset DSPs on adapter */
+        iowrite32(0x0003000F, phw->dw2040_HPICSR + HPI_RESET);
+
+        kfree(phw);
 }
 
 /************************************************************************/
@@ -645,11 +625,13 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 #ifndef HIDE_PCI_ASSERTS
         /* if we have PCI2040 asserts then collect them */
         if ((gw_pci_read_asserts > 0) || (gw_pci_write_asserts > 0)) {
-                phr->u.a.serial_number =
+                phr->u.ax.assert.p1 =
                         gw_pci_read_asserts * 100 + gw_pci_write_asserts;
-                phr->u.a.adapter_index = 1;     /* assert count */
-                phr->u.a.adapter_type = -1;     /* "dsp index" */
-                strcpy(phr->u.a.sz_adapter_assert, "PCI2040 error");
+                phr->u.ax.assert.p2 = 0;
+                phr->u.ax.assert.count = 1;     /* assert count */
+                phr->u.ax.assert.dsp_index = -1;        /* "dsp index" */
+                strcpy(phr->u.ax.assert.sz_message, "PCI2040 error");
+                phr->u.ax.assert.dsp_msg_addr = 0;
                 gw_pci_read_asserts = 0;
                 gw_pci_write_asserts = 0;
                 phr->error = 0;
@@ -686,10 +668,10 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
         /* NOTE don't use wAdapterType in this routine. It is not setup yet */
 
-        switch (pao->pci.subsys_device_id) {
+        switch (pao->pci.pci_dev->subsystem_device) {
         case 0x5100:
         case 0x5110:    /* ASI5100 revB or higher with C6711D */
-        case 0x5200:    /* ASI5200 PC_ie version of ASI5100 */
+        case 0x5200:    /* ASI5200 PCIe version of ASI5100 */
         case 0x6100:
         case 0x6200:
                 boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x6200);
@@ -709,8 +691,9 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
          * note that bits 4..15 are read-only and so should always return zero,
          * even though we wrote 1 to them
          */
-        for (i = 0; i < 1000; i++)
-                delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+        hpios_delay_micro_seconds(1000);
+        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+
         if (delay != dw2040_reset) {
                 HPI_DEBUG_LOG(ERROR, "INIT_PCI2040 %x %x\n", dw2040_reset,
                         delay);
@@ -743,8 +726,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         dw2040_reset = dw2040_reset & (~0x00000008);
         iowrite32(dw2040_reset, phw->dw2040_HPICSR + HPI_RESET);
         /*delay to allow DSP to get going */
-        for (i = 0; i < 100; i++)
-                delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+        hpios_delay_micro_seconds(100);
 
         /* loop through all DSPs, downloading DSP code */
         for (dsp_index = 0; dsp_index < phw->num_dsp; dsp_index++) {
@@ -783,27 +765,27 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                          */
                         /* bypass PLL */
                         hpi_write_word(pdo, 0x01B7C100, 0x0000);
-                        for (i = 0; i < 100; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+                        hpios_delay_micro_seconds(100);
 
                         /*  ** use default of PLL  x7 ** */
                         /* EMIF = 225/3=75MHz */
                         hpi_write_word(pdo, 0x01B7C120, 0x8002);
+                        hpios_delay_micro_seconds(100);
+
                         /* peri = 225/2 */
                         hpi_write_word(pdo, 0x01B7C11C, 0x8001);
+                        hpios_delay_micro_seconds(100);
+
                         /* cpu  = 225/1 */
                         hpi_write_word(pdo, 0x01B7C118, 0x8000);
-                        /* ~200us delay */
-                        for (i = 0; i < 2000; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+
+                        /* ~2ms delay */
+                        hpios_delay_micro_seconds(2000);
+
                         /* PLL not bypassed */
                         hpi_write_word(pdo, 0x01B7C100, 0x0001);
-                        /* ~200us delay */
-                        for (i = 0; i < 2000; i++)
-                                delay = ioread32(phw->dw2040_HPICSR +
-                                        HPI_RESET);
+                        /* ~2ms delay */
+                        hpios_delay_micro_seconds(2000);
                 }
 
                 /* test r/w to internal DSP memory
@@ -927,9 +909,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                 }
 
                 /* delay a little to allow SDRAM and DSP to "get going" */
-
-                for (i = 0; i < 1000; i++)
-                        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+                hpios_delay_micro_seconds(1000);
 
                 /* test access to SDRAM */
                 {
@@ -976,7 +956,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
                 /* write the DSP code down into the DSPs memory */
                 /*HpiDspCode_Open(nBootLoadFamily,&DspCode,pdwOsErrorCode); */
-                dsp_code.ps_dev = pao->pci.p_os_data;
+                dsp_code.ps_dev = pao->pci.pci_dev;
 
                 error = hpi_dsp_code_open(boot_load_family, &dsp_code,
                         pos_error_code);
@@ -1073,8 +1053,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
 
                 /* step 3. Start code by sending interrupt */
                 iowrite32(0x00030003, pdo->prHPI_control);
-                for (i = 0; i < 10000; i++)
-                        delay = ioread32(phw->dw2040_HPICSR + HPI_RESET);
+                hpios_delay_micro_seconds(10000);
 
                 /* wait for a non-zero value in hostcmd -
                  * indicating initialization is complete
@@ -1101,7 +1080,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                          * locks up with a bluescreen (NOT GPF or pagefault).
                          */
                         else
-                                hpios_delay_micro_seconds(1000);
+                                hpios_delay_micro_seconds(10000);
                 }
                 if (timeout == 0)
                         return HPI6000_ERROR_INIT_NOACK;
@@ -1132,14 +1111,14 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                                 mask = 0xFFFFFF00L;
                                 /* ASI5100 uses AX6 code, */
                                 /* but has no PLD r/w register to test */
-                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.
-                                                subsys_device_id) ==
+                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.pci_dev->
+                                                subsystem_device) ==
                                         HPI_ADAPTER_FAMILY_ASI(0x5100))
                                         mask = 0x00000000L;
                                 /* ASI5200 uses AX6 code, */
                                 /* but has no PLD r/w register to test */
-                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.
-                                                subsys_device_id) ==
+                                if (HPI_ADAPTER_FAMILY_ASI(pao->pci.pci_dev->
+                                                subsystem_device) ==
                                         HPI_ADAPTER_FAMILY_ASI(0x5200))
                                         mask = 0x00000000L;
                                 break;
@@ -1204,7 +1183,7 @@ static u32 hpi_read_word(struct dsp_obj *pdo, u32 address)
         u32 data = 0;
 
         if (hpi_set_address(pdo, address))
-                return 0;       /*? no way to return error */
+                return 0;       /*? No way to return error */
 
         /* take care of errata in revB DSP (2.0.1) */
         data = ioread32(pdo->prHPI_data);
@@ -1340,10 +1319,6 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         u32 *p_data;
         u16 error = 0;
 
-        /* does the DSP we are referencing exist? */
-        if (dsp_index >= phw->num_dsp)
-                return HPI6000_ERROR_MSG_INVALID_DSP_INDEX;
-
         ack = hpi6000_wait_dsp_ack(pao, dsp_index, HPI_HIF_IDLE);
         if (ack & HPI_HIF_ERROR_MASK) {
                 pao->dsp_crashed++;
@@ -1351,9 +1326,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         }
         pao->dsp_crashed = 0;
 
-        /* send the message */
-
-        /* get the address and size */
+        /* get the message address and size */
         if (phw->message_buffer_address_on_dsp == 0) {
                 timeout = TIMEOUT;
                 do {
@@ -1368,10 +1341,9 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         } else
                 address = phw->message_buffer_address_on_dsp;
 
-        /*        dwLength = sizeof(struct hpi_message); */
         length = phm->size;
 
-        /* send it */
+        /* send the message */
         p_data = (u32 *)phm;
         if (hpi6000_dsp_block_write32(pao, dsp_index, address, p_data,
                         (u16)length / 4))
@@ -1385,7 +1357,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         if (ack & HPI_HIF_ERROR_MASK)
                 return HPI6000_ERROR_MSG_RESP_GET_RESP_ACK;
 
-        /* get the address and size */
+        /* get the response address */
         if (phw->response_buffer_address_on_dsp == 0) {
                 timeout = TIMEOUT;
                 do {
@@ -1409,7 +1381,7 @@ static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         if (!timeout)
                 length = sizeof(struct hpi_response);
 
-        /* get it */
+        /* get the response */
         p_data = (u32 *)phr;
         if (hpi6000_dsp_block_read32(pao, dsp_index, address, p_data,
                         (u16)length / 4))
@@ -1805,17 +1777,11 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
         hpios_dsplock_lock(pao);
         error = hpi6000_message_response_sequence(pao, dsp_index, phm, phr);
 
-        /* maybe an error response */
-        if (error) {
-                /* something failed in the HPI/DSP interface */
-                phr->error = error;
-                /* just the header of the response is valid */
-                phr->size = sizeof(struct hpi_response_header);
+        if (error)      /* something failed in the HPI/DSP interface */
                 goto err;
-        }
 
-        if (phr->error != 0)    /* something failed in the DSP */
-                goto err;
+        if (phr->error) /* something failed in the DSP */
+                goto out;
 
         switch (phm->function) {
         case HPI_OSTREAM_WRITE:
@@ -1827,21 +1793,30 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
                 error = hpi6000_get_data(pao, dsp_index, phm, phr);
                 break;
         case HPI_ADAPTER_GET_ASSERT:
-                phr->u.a.adapter_index = 0;     /* dsp 0 default */
+                phr->u.ax.assert.dsp_index = 0; /* dsp 0 default */
                 if (num_dsp == 2) {
-                        if (!phr->u.a.adapter_type) {
+                        if (!phr->u.ax.assert.count) {
                                 /* no assert from dsp 0, check dsp 1 */
                                 error = hpi6000_message_response_sequence(pao,
                                         1, phm, phr);
-                                phr->u.a.adapter_index = 1;
+                                phr->u.ax.assert.dsp_index = 1;
                         }
                 }
         }
 
-        if (error)
-                phr->error = error;
-
 err:
+        if (error) {
+                if (error >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_COMMUNICATION;
+                        phr->specific_error = error;
+                } else {
+                        phr->error = error;
+                }
+
+                /* just the header of the response is valid */
+                phr->size = sizeof(struct hpi_response_header);
+        }
+out:
         hpios_dsplock_unlock(pao);
         return;
 }
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index 2672f6591ceb..620525bdac59 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -38,27 +38,26 @@
 
 /*****************************************************************************/
 /* HPI6205 specific error codes */
-#define HPI6205_ERROR_BASE                      1000
-/*#define HPI6205_ERROR_MEM_ALLOC 1001 */
+#define HPI6205_ERROR_BASE 1000 /* not actually used anywhere */
+
+/* operational/messaging errors */
+#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT     1015
+#define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016
+
+/* initialization/bootload errors */
 #define HPI6205_ERROR_6205_NO_IRQ               1002
 #define HPI6205_ERROR_6205_INIT_FAILED          1003
-/*#define HPI6205_ERROR_MISSING_DSPCODE 1004 */
-#define HPI6205_ERROR_UNKNOWN_PCI_DEVICE        1005
 #define HPI6205_ERROR_6205_REG                  1006
 #define HPI6205_ERROR_6205_DSPPAGE              1007
-#define HPI6205_ERROR_BAD_DSPINDEX              1008
 #define HPI6205_ERROR_C6713_HPIC                1009
 #define HPI6205_ERROR_C6713_HPIA                1010
 #define HPI6205_ERROR_C6713_PLL                 1011
 #define HPI6205_ERROR_DSP_INTMEM                1012
 #define HPI6205_ERROR_DSP_EXTMEM                1013
 #define HPI6205_ERROR_DSP_PLD                   1014
-#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT     1015
-#define HPI6205_ERROR_MSG_RESP_TIMEOUT          1016
 #define HPI6205_ERROR_6205_EEPROM               1017
 #define HPI6205_ERROR_DSP_EMIF                  1018
 
-#define hpi6205_error(dsp_index, err) (err)
 /*****************************************************************************/
 /* for C6205 PCI i/f */
 /* Host Status Register (HSR) bitfields */
@@ -128,9 +127,6 @@ struct hpi_hw_obj {
         u32 outstream_host_buffer_size[HPI_MAX_STREAMS];
 
         struct consistent_dma_area h_control_cache;
-        struct consistent_dma_area h_async_event_buffer;
-/*      struct hpi_control_cache_single *pControlCache; */
-        struct hpi_async_event *p_async_event_buffer;
         struct hpi_control_cache *p_cache;
 };
 
@@ -208,8 +204,8 @@ static void instream_start(struct hpi_adapter_obj *pao,
 static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,
         u32 address);
 
-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
-        u32 address, u32 data);
+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,
+        int dsp_index, u32 address, u32 data);
 
 static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao,
         int dsp_index);
@@ -229,17 +225,7 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index);
 
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 {
-
         switch (phm->function) {
-        case HPI_SUBSYS_OPEN:
-        case HPI_SUBSYS_CLOSE:
-        case HPI_SUBSYS_GET_INFO:
-        case HPI_SUBSYS_DRIVER_UNLOAD:
-        case HPI_SUBSYS_DRIVER_LOAD:
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                /* messages that should not get here */
-                phr->error = HPI_ERROR_UNIMPLEMENTED;
-                break;
         case HPI_SUBSYS_CREATE_ADAPTER:
                 subsys_create_adapter(phm, phr);
                 break;
@@ -257,15 +243,22 @@ static void control_message(struct hpi_adapter_obj *pao,
 {
 
         struct hpi_hw_obj *phw = pao->priv;
+        u16 pending_cache_error = 0;
 
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
-                        rmb();  /* make sure we see updates DM_aed from DSP */
-                        if (hpi_check_control_cache(phw->p_cache, phm, phr))
+                        rmb();  /* make sure we see updates DMAed from DSP */
+                        if (hpi_check_control_cache(phw->p_cache, phm, phr)) {
                                 break;
+                        } else if (phm->u.c.attribute == HPI_METER_PEAK) {
+                                pending_cache_error =
+                                        HPI_ERROR_CONTROL_CACHING;
+                        }
                 }
                 hw_message(pao, phm, phr);
+                if (pending_cache_error && !phr->error)
+                        phr->error = pending_cache_error;
                 break;
         case HPI_CONTROL_GET_INFO:
                 hw_message(pao, phm, phr);
@@ -273,7 +266,8 @@ static void control_message(struct hpi_adapter_obj *pao,
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
                 if (pao->has_control_cache)
-                        hpi_sync_control_cache(phw->p_cache, phm, phr);
+                        hpi_cmn_control_cache_sync_to_msg(phw->p_cache, phm,
+                                phr);
                 break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
@@ -296,9 +290,9 @@ static void outstream_message(struct hpi_adapter_obj *pao,
 {
 
         if (phm->obj_index >= HPI_MAX_STREAMS) {
-                phr->error = HPI_ERROR_INVALID_STREAM;
+                phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 HPI_DEBUG_LOG(WARNING,
-                        "message referencing invalid stream %d "
+                        "Message referencing invalid stream %d "
                         "on adapter index %d\n", phm->obj_index,
                         phm->adapter_index);
                 return;
@@ -340,9 +334,9 @@ static void instream_message(struct hpi_adapter_obj *pao,
 {
 
         if (phm->obj_index >= HPI_MAX_STREAMS) {
-                phr->error = HPI_ERROR_INVALID_STREAM;
+                phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 HPI_DEBUG_LOG(WARNING,
-                        "message referencing invalid stream %d "
+                        "Message referencing invalid stream %d "
                         "on adapter index %d\n", phm->obj_index,
                         phm->adapter_index);
                 return;
@@ -385,8 +379,8 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
          * All other messages are ignored unless the adapter index matches
          * an adapter in the HPI
          */
-        HPI_DEBUG_LOG(DEBUG, "HPI obj=%d, func=%d\n", phm->object,
-                phm->function);
+        /* HPI_DEBUG_LOG(DEBUG, "HPI Obj=%d, Func=%d\n", phm->wObject,
+           phm->wFunction); */
 
         /* if Dsp has crashed then do not communicate with it any more */
         if (phm->object != HPI_OBJ_SUBSYSTEM) {
@@ -411,8 +405,7 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
 
         /* Init default response  */
         if (phm->function != HPI_SUBSYS_CREATE_ADAPTER)
-                hpi_init_response(phr, phm->object, phm->function,
-                        HPI_ERROR_PROCESSING_MESSAGE);
+                phr->error = HPI_ERROR_PROCESSING_MESSAGE;
 
         HPI_DEBUG_LOG(VERBOSE, "start of switch\n");
         switch (phm->type) {
@@ -423,9 +416,6 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr)
                         break;
 
                 case HPI_OBJ_ADAPTER:
-                        phr->size =
-                                sizeof(struct hpi_response_header) +
-                                sizeof(struct hpi_adapter_res);
                         adapter_message(pao, phm, phr);
                         break;
 
@@ -474,14 +464,6 @@ static void subsys_create_adapter(struct hpi_message *phm,
 
         memset(&ao, 0, sizeof(ao));
 
-        /* this HPI only creates adapters for TI/PCI devices */
-        if (phm->u.s.resource.bus_type != HPI_BUS_PCI)
-                return;
-        if (phm->u.s.resource.r.pci->vendor_id != HPI_PCI_VENDOR_ID_TI)
-                return;
-        if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_DSP6205)
-                return;
-
         ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
         if (!ao.priv) {
                 HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
@@ -491,18 +473,20 @@ static void subsys_create_adapter(struct hpi_message *phm,
 
         ao.pci = *phm->u.s.resource.r.pci;
         err = create_adapter_obj(&ao, &os_error_code);
-        if (!err)
-                err = hpi_add_adapter(&ao);
         if (err) {
-                phr->u.s.data = os_error_code;
                 delete_adapter_obj(&ao);
-                phr->error = err;
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_BOOTLOAD;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+                phr->u.s.data = os_error_code;
                 return;
         }
 
-        phr->u.s.aw_adapter_list[ao.index] = ao.adapter_type;
+        phr->u.s.adapter_type = ao.adapter_type;
         phr->u.s.adapter_index = ao.index;
-        phr->u.s.num_adapters++;
         phr->error = 0;
 }
 
@@ -513,7 +497,7 @@ static void subsys_delete_adapter(struct hpi_message *phm,
         struct hpi_adapter_obj *pao;
         struct hpi_hw_obj *phw;
 
-        pao = hpi_find_adapter(phm->adapter_index);
+        pao = hpi_find_adapter(phm->obj_index);
         if (!pao) {
                 phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
                 return;
@@ -526,6 +510,7 @@ static void subsys_delete_adapter(struct hpi_message *phm,
         iowrite32(C6205_HDCR_WARMRESET, phw->prHDCR);
 
         delete_adapter_obj(pao);
+        hpi_delete_adapter(pao);
         phr->error = 0;
 }
 
@@ -538,10 +523,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
         struct hpi_hw_obj *phw = pao->priv;
         struct bus_master_interface *interface;
         u32 phys_addr;
-#ifndef HPI6205_NO_HSR_POLL
-        u32 time_out = HPI6205_TIMEOUT;
-        u32 temp1;
-#endif
         int i;
         u16 err;
 
@@ -566,7 +547,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
 
         if (hpios_locked_mem_alloc(&phw->h_locked_mem,
                         sizeof(struct bus_master_interface),
-                        pao->pci.p_os_data))
+                        pao->pci.pci_dev))
                 phw->p_interface_buffer = NULL;
         else if (hpios_locked_mem_get_virt_addr(&phw->h_locked_mem,
                         (void *)&phw->p_interface_buffer))
@@ -591,49 +572,29 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
 
         /* allow boot load even if mem alloc wont work */
         if (!phw->p_interface_buffer)
-                return hpi6205_error(0, HPI_ERROR_MEMORY_ALLOC);
+                return HPI_ERROR_MEMORY_ALLOC;
 
         interface = phw->p_interface_buffer;
 
-#ifndef HPI6205_NO_HSR_POLL
-        /* wait for first interrupt indicating the DSP init is done */
-        time_out = HPI6205_TIMEOUT * 10;
-        temp1 = 0;
-        while (((temp1 & C6205_HSR_INTSRC) == 0) && --time_out)
-                temp1 = ioread32(phw->prHSR);
-
-        if (temp1 & C6205_HSR_INTSRC)
-                HPI_DEBUG_LOG(INFO,
-                        "interrupt confirming DSP code running OK\n");
-        else {
-                HPI_DEBUG_LOG(ERROR,
-                        "timed out waiting for interrupt "
-                        "confirming DSP code running\n");
-                return hpi6205_error(0, HPI6205_ERROR_6205_NO_IRQ);
-        }
-
-        /* reset the interrupt */
-        iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
-
         /* make sure the DSP has started ok */
         if (!wait_dsp_ack(phw, H620_HIF_RESET, HPI6205_TIMEOUT * 10)) {
                 HPI_DEBUG_LOG(ERROR, "timed out waiting reset state \n");
-                return hpi6205_error(0, HPI6205_ERROR_6205_INIT_FAILED);
+                return HPI6205_ERROR_6205_INIT_FAILED;
         }
         /* Note that *pao, *phw are zeroed after allocation,
          * so pointers and flags are NULL by default.
          * Allocate bus mastering control cache buffer and tell the DSP about it
          */
         if (interface->control_cache.number_of_controls) {
-                void *p_control_cache_virtual;
+                u8 *p_control_cache_virtual;
 
                 err = hpios_locked_mem_alloc(&phw->h_control_cache,
                         interface->control_cache.size_in_bytes,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
                 if (!err)
                         err = hpios_locked_mem_get_virt_addr(&phw->
-                                h_control_cache, &p_control_cache_virtual);
+                                h_control_cache,
+                                (void *)&p_control_cache_virtual);
                 if (!err) {
                         memset(p_control_cache_virtual, 0,
                                 interface->control_cache.size_in_bytes);
@@ -642,7 +603,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                                 hpi_alloc_control_cache(interface->
                                 control_cache.number_of_controls,
                                 interface->control_cache.size_in_bytes,
-                                (struct hpi_control_cache_info *)
                                 p_control_cache_virtual);
                         if (!phw->p_cache)
                                 err = HPI_ERROR_MEMORY_ALLOC;
@@ -662,78 +622,56 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                         pao->has_control_cache = 0;
                 }
         }
-        /* allocate bus mastering async buffer and tell the DSP about it */
-        if (interface->async_buffer.b.size) {
-                err = hpios_locked_mem_alloc(&phw->h_async_event_buffer,
-                        interface->async_buffer.b.size *
-                        sizeof(struct hpi_async_event), pao->pci.p_os_data);
-                if (!err)
-                        err = hpios_locked_mem_get_virt_addr
-                                (&phw->h_async_event_buffer, (void *)
-                                &phw->p_async_event_buffer);
-                if (!err)
-                        memset((void *)phw->p_async_event_buffer, 0,
-                                interface->async_buffer.b.size *
-                                sizeof(struct hpi_async_event));
-                if (!err) {
-                        err = hpios_locked_mem_get_phys_addr
-                                (&phw->h_async_event_buffer, &phys_addr);
-                        interface->async_buffer.physical_address32 =
-                                phys_addr;
-                }
-                if (err) {
-                        if (hpios_locked_mem_valid(&phw->
-                                        h_async_event_buffer)) {
-                                hpios_locked_mem_free
-                                        (&phw->h_async_event_buffer);
-                                phw->p_async_event_buffer = NULL;
-                        }
-                }
-        }
         send_dsp_command(phw, H620_HIF_IDLE);
 
         {
-                struct hpi_message hM;
-                struct hpi_response hR;
+                struct hpi_message hm;
+                struct hpi_response hr;
                 u32 max_streams;
 
                 HPI_DEBUG_LOG(VERBOSE, "init ADAPTER_GET_INFO\n");
-                memset(&hM, 0, sizeof(hM));
-                hM.type = HPI_TYPE_MESSAGE;
-                hM.size = sizeof(hM);
-                hM.object = HPI_OBJ_ADAPTER;
-                hM.function = HPI_ADAPTER_GET_INFO;
-                hM.adapter_index = 0;
-                memset(&hR, 0, sizeof(hR));
-                hR.size = sizeof(hR);
-
-                err = message_response_sequence(pao, &hM, &hR);
+                memset(&hm, 0, sizeof(hm));
+                hm.type = HPI_TYPE_MESSAGE;
+                hm.size = sizeof(hm);
+                hm.object = HPI_OBJ_ADAPTER;
+                hm.function = HPI_ADAPTER_GET_INFO;
+                hm.adapter_index = 0;
+                memset(&hr, 0, sizeof(hr));
+                hr.size = sizeof(hr);
+
+                err = message_response_sequence(pao, &hm, &hr);
                 if (err) {
                         HPI_DEBUG_LOG(ERROR, "message transport error %d\n",
                                 err);
                         return err;
                 }
-                if (hR.error)
-                        return hR.error;
+                if (hr.error)
+                        return hr.error;
 
-                pao->adapter_type = hR.u.a.adapter_type;
-                pao->index = hR.u.a.adapter_index;
+                pao->adapter_type = hr.u.ax.info.adapter_type;
+                pao->index = hr.u.ax.info.adapter_index;
 
-                max_streams = hR.u.a.num_outstreams + hR.u.a.num_instreams;
+                max_streams =
+                        hr.u.ax.info.num_outstreams +
+                        hr.u.ax.info.num_instreams;
 
                 hpios_locked_mem_prepare((max_streams * 6) / 10, max_streams,
-                        65536, pao->pci.p_os_data);
+                        65536, pao->pci.pci_dev);
 
                 HPI_DEBUG_LOG(VERBOSE,
                         "got adapter info type %x index %d serial %d\n",
-                        hR.u.a.adapter_type, hR.u.a.adapter_index,
-                        hR.u.a.serial_number);
+                        hr.u.ax.info.adapter_type, hr.u.ax.info.adapter_index,
+                        hr.u.ax.info.serial_number);
         }
 
         pao->open = 0;  /* upon creation the adapter is closed */
 
+        if (phw->p_cache)
+                phw->p_cache->adap_idx = pao->index;
+
         HPI_DEBUG_LOG(INFO, "bootload DSP OK\n");
-        return 0;
+
+        return hpi_add_adapter(pao);
 }
 
 /** Free memory areas allocated by adapter
@@ -747,11 +685,6 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao)
 
         phw = pao->priv;
 
-        if (hpios_locked_mem_valid(&phw->h_async_event_buffer)) {
-                hpios_locked_mem_free(&phw->h_async_event_buffer);
-                phw->p_async_event_buffer = NULL;
-        }
-
         if (hpios_locked_mem_valid(&phw->h_control_cache)) {
                 hpios_locked_mem_free(&phw->h_control_cache);
                 hpi_free_control_cache(phw->p_cache);
@@ -776,13 +709,15 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao)
                         phw->outstream_host_buffer_size[i] = 0;
                 }
 
-        hpios_locked_mem_unprepare(pao->pci.p_os_data);
+        hpios_locked_mem_unprepare(pao->pci.pci_dev);
 
-        hpi_delete_adapter(pao);
         kfree(phw);
 }
 
 /*****************************************************************************/
+/* Adapter functions */
+
+/*****************************************************************************/
 /* OutStream Host buffer functions */
 
 /** Allocate or attach buffer for busmastering
@@ -824,7 +759,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
 
                 err = hpios_locked_mem_alloc(&phw->outstream_host_buffers
                         [phm->obj_index], phm->u.d.u.buffer.buffer_size,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
 
                 if (err) {
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -861,7 +796,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 if (phm->u.d.u.buffer.buffer_size & (phm->u.d.u.buffer.
                                 buffer_size - 1)) {
                         HPI_DEBUG_LOG(ERROR,
-                                "buffer size must be 2^N not %d\n",
+                                "Buffer size must be 2^N not %d\n",
                                 phm->u.d.u.buffer.buffer_size);
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
                         return;
@@ -875,6 +810,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 status->dSP_index = 0;
                 status->host_index = status->dSP_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
+                status->auxiliary_data_available = 0;
 
                 hw_message(pao, phm, phr);
 
@@ -966,51 +902,6 @@ static void outstream_write(struct hpi_adapter_obj *pao,
         hpi_init_response(phr, phm->object, phm->function, 0);
         status = &interface->outstream_host_buffer_status[phm->obj_index];
 
-        if (phw->flag_outstream_just_reset[phm->obj_index]) {
-                /* First OutStremWrite() call following reset will write data to the
-                   adapter's buffers, reducing delay before stream can start. The DSP
-                   takes care of setting the stream data format using format information
-                   embedded in phm.
-                 */
-                int partial_write = 0;
-                unsigned int original_size = 0;
-
-                phw->flag_outstream_just_reset[phm->obj_index] = 0;
-
-                /* Send the first buffer to the DSP the old way. */
-                /* Limit size of first transfer - */
-                /* expect that this will not usually be triggered. */
-                if (phm->u.d.u.data.data_size > HPI6205_SIZEOF_DATA) {
-                        partial_write = 1;
-                        original_size = phm->u.d.u.data.data_size;
-                        phm->u.d.u.data.data_size = HPI6205_SIZEOF_DATA;
-                }
-                /* write it */
-                phm->function = HPI_OSTREAM_WRITE;
-                hw_message(pao, phm, phr);
-
-                if (phr->error)
-                        return;
-
-                /* update status information that the DSP would typically
-                 * update (and will update next time the DSP
-                 * buffer update task reads data from the host BBM buffer)
-                 */
-                status->auxiliary_data_available = phm->u.d.u.data.data_size;
-                status->host_index += phm->u.d.u.data.data_size;
-                status->dSP_index += phm->u.d.u.data.data_size;
-
-                /* if we did a full write, we can return from here. */
-                if (!partial_write)
-                        return;
-
-                /* tweak buffer parameters and let the rest of the */
-                /* buffer land in internal BBM buffer */
-                phm->u.d.u.data.data_size =
-                        original_size - HPI6205_SIZEOF_DATA;
-                phm->u.d.u.data.pb_data += HPI6205_SIZEOF_DATA;
-        }
-
         space_available = outstream_get_space_available(status);
         if (space_available < phm->u.d.u.data.data_size) {
                 phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -1047,6 +938,24 @@ static void outstream_write(struct hpi_adapter_obj *pao,
                 memcpy(p_bbm_data, p_app_data + l_first_write,
                         phm->u.d.u.data.data_size - l_first_write);
         }
+
+        /*
+         * This version relies on the DSP code triggering an OStream buffer
+         * update immediately following a SET_FORMAT call. The host has
+         * already written data into the BBM buffer, but the DSP won't know
+         * about it until dwHostIndex is adjusted.
+         */
+        if (phw->flag_outstream_just_reset[phm->obj_index]) {
+                /* Format can only change after reset. Must tell DSP. */
+                u16 function = phm->function;
+                phw->flag_outstream_just_reset[phm->obj_index] = 0;
+                phm->function = HPI_OSTREAM_SET_FORMAT;
+                hw_message(pao, phm, phr);      /* send the format to the DSP */
+                phm->function = function;
+                if (phr->error)
+                        return;
+        }
+
         status->host_index += phm->u.d.u.data.data_size;
 }
 
@@ -1132,7 +1041,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
 
                 err = hpios_locked_mem_alloc(&phw->instream_host_buffers[phm->
                                 obj_index], phm->u.d.u.buffer.buffer_size,
-                        pao->pci.p_os_data);
+                        pao->pci.pci_dev);
 
                 if (err) {
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
@@ -1163,7 +1072,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 if (phm->u.d.u.buffer.buffer_size & (phm->u.d.u.buffer.
                                 buffer_size - 1)) {
                         HPI_DEBUG_LOG(ERROR,
-                                "buffer size must be 2^N not %d\n",
+                                "Buffer size must be 2^N not %d\n",
                                 phm->u.d.u.buffer.buffer_size);
                         phr->error = HPI_ERROR_INVALID_DATASIZE;
                         return;
@@ -1178,8 +1087,10 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
                 status->dSP_index = 0;
                 status->host_index = status->dSP_index;
                 status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
+                status->auxiliary_data_available = 0;
 
                 hw_message(pao, phm, phr);
+
                 if (phr->error
                         && hpios_locked_mem_valid(&phw->
                                 instream_host_buffers[phm->obj_index])) {
@@ -1344,33 +1255,36 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         struct hpi_hw_obj *phw = pao->priv;
         struct dsp_code dsp_code;
         u16 boot_code_id[HPI6205_MAX_FILES_TO_LOAD];
-        u16 firmware_id = pao->pci.subsys_device_id;
         u32 temp;
         int dsp = 0, i = 0;
         u16 err = 0;
 
         boot_code_id[0] = HPI_ADAPTER_ASI(0x6205);
 
-        /* special cases where firmware_id != subsys ID */
-        switch (firmware_id) {
+        boot_code_id[1] = pao->pci.pci_dev->subsystem_device;
+        boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(boot_code_id[1]);
+
+        /* fix up cases where bootcode id[1] != subsys id */
+        switch (boot_code_id[1]) {
         case HPI_ADAPTER_FAMILY_ASI(0x5000):
-                boot_code_id[0] = firmware_id;
-                firmware_id = 0;
+                boot_code_id[0] = boot_code_id[1];
+                boot_code_id[1] = 0;
                 break;
         case HPI_ADAPTER_FAMILY_ASI(0x5300):
         case HPI_ADAPTER_FAMILY_ASI(0x5400):
         case HPI_ADAPTER_FAMILY_ASI(0x6300):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6400);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6400);
                 break;
         case HPI_ADAPTER_FAMILY_ASI(0x5600):
         case HPI_ADAPTER_FAMILY_ASI(0x6500):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x6600);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x6600);
                 break;
         case HPI_ADAPTER_FAMILY_ASI(0x8800):
-                firmware_id = HPI_ADAPTER_FAMILY_ASI(0x8900);
+                boot_code_id[1] = HPI_ADAPTER_FAMILY_ASI(0x8900);
+                break;
+        default:
                 break;
         }
-        boot_code_id[1] = firmware_id;
 
         /* reset DSP by writing a 1 to the WARMRESET bit */
         temp = C6205_HDCR_WARMRESET;
@@ -1381,7 +1295,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         temp = ioread32(phw->prHSR);
         if ((temp & (C6205_HSR_CFGERR | C6205_HSR_EEREAD)) !=
                 C6205_HSR_EEREAD)
-                return hpi6205_error(0, HPI6205_ERROR_6205_EEPROM);
+                return HPI6205_ERROR_6205_EEPROM;
         temp |= 0x04;
         /* disable PINTA interrupt */
         iowrite32(temp, phw->prHSR);
@@ -1389,27 +1303,27 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         /* check control register reports PCI boot mode */
         temp = ioread32(phw->prHDCR);
         if (!(temp & C6205_HDCR_PCIBOOT))
-                return hpi6205_error(0, HPI6205_ERROR_6205_REG);
+                return HPI6205_ERROR_6205_REG;
 
-        /* try writing a couple of numbers to the DSP page register */
+        /* try writing a few numbers to the DSP page register */
         /* and reading them back. */
-        temp = 1;
+        temp = 3;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         temp = 2;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
-        temp = 3;
+                return HPI6205_ERROR_6205_DSPPAGE;
+        temp = 1;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         /* reset DSP page to the correct number */
         temp = 0;
         iowrite32(temp, phw->prDSPP);
         if ((temp | C6205_DSPP_MAP1) != ioread32(phw->prDSPP))
-                return hpi6205_error(0, HPI6205_ERROR_6205_DSPPAGE);
+                return HPI6205_ERROR_6205_DSPPAGE;
         phw->dsp_page = 0;
 
         /* release 6713 from reset before 6205 is bootloaded.
@@ -1455,7 +1369,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                         return err;
 
                 /* write the DSP code down into the DSPs memory */
-                dsp_code.ps_dev = pao->pci.p_os_data;
+                dsp_code.ps_dev = pao->pci.pci_dev;
                 err = hpi_dsp_code_open(boot_code_id[dsp], &dsp_code,
                         pos_error_code);
                 if (err)
@@ -1484,10 +1398,8 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                         if (err)
                                 break;
                         for (i = 0; i < (int)length; i++) {
-                                err = boot_loader_write_mem32(pao, dsp,
-                                        address, *pcode);
-                                if (err)
-                                        break;
+                                boot_loader_write_mem32(pao, dsp, address,
+                                        *pcode);
                                 /* dummy read every 4 words */
                                 /* for 6205 advisory 1.4.4 */
                                 if (i % 4 == 0)
@@ -1561,7 +1473,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
                 host_mailbox_address_on_dsp = 0x80000000;
                 while ((physicalPC_iaddress != physicalPC_iaddress_verify)
                         && time_out--) {
-                        err = boot_loader_write_mem32(pao, 0,
+                        boot_loader_write_mem32(pao, 0,
                                 host_mailbox_address_on_dsp,
                                 physicalPC_iaddress);
                         physicalPC_iaddress_verify =
@@ -1631,11 +1543,10 @@ static u32 boot_loader_read_mem32(struct hpi_adapter_obj *pao, int dsp_index,
         return data;
 }
 
-static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
-        u32 address, u32 data)
+static void boot_loader_write_mem32(struct hpi_adapter_obj *pao,
+        int dsp_index, u32 address, u32 data)
 {
         struct hpi_hw_obj *phw = pao->priv;
-        u16 err = 0;
         __iomem u32 *p_data;
         /*      u32 dwVerifyData=0; */
 
@@ -1675,15 +1586,11 @@ static u16 boot_loader_write_mem32(struct hpi_adapter_obj *pao, int dsp_index,
 
                 /* dummy read every 4 words for 6205 advisory 1.4.4 */
                 boot_loader_read_mem32(pao, 0, 0);
-        } else
-                err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
-        return err;
+        }
 }
 
 static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
 {
-        u16 err = 0;
-
         if (dsp_index == 0) {
                 u32 setting;
 
@@ -1711,8 +1618,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800008, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800008))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE1 setup - 32 bit async. This is 6713 #1 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1725,8 +1631,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800004, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800004))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE2 setup - 32 bit async. This is 6713 #2 HPI, */
                 /* which occupies D15..0. 6713 starts at 27MHz, so need */
@@ -1738,8 +1643,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800010, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800010))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* EMIF CE3 setup - 32 bit async. */
                 /* This is the PLD on the ASI5000 cards only */
@@ -1750,8 +1654,7 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 boot_loader_write_mem32(pao, dsp_index, 0x01800014, setting);
                 if (setting != boot_loader_read_mem32(pao, dsp_index,
                                 0x01800014))
-                        return hpi6205_error(dsp_index,
-                                HPI6205_ERROR_DSP_EMIF);
+                        return HPI6205_ERROR_DSP_EMIF;
 
                 /* set EMIF SDRAM control for 2Mx32 SDRAM (512x32x4 bank) */
                 /*  need to use this else DSP code crashes? */
@@ -1775,12 +1678,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 read_data =
                         0xFFF7 & boot_loader_read_mem32(pao, 0, HPICL_ADDR);
                 if (write_data != read_data) {
-                        err = hpi6205_error(dsp_index,
-                                HPI6205_ERROR_C6713_HPIC);
                         HPI_DEBUG_LOG(ERROR, "HPICL %x %x\n", write_data,
                                 read_data);
-
-                        return err;
+                        return HPI6205_ERROR_C6713_HPIC;
                 }
                 /* HPIA - walking ones test */
                 write_data = 1;
@@ -1798,11 +1698,9 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                                                 HPIAH_ADDR))
                                 << 16);
                         if (read_data != write_data) {
-                                err = hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_C6713_HPIA);
                                 HPI_DEBUG_LOG(ERROR, "HPIA %x %x\n",
                                         write_data, read_data);
-                                return err;
+                                return HPI6205_ERROR_C6713_HPIA;
                         }
                         write_data = write_data << 1;
                 }
@@ -1847,30 +1745,81 @@ static u16 boot_loader_config_emif(struct hpi_adapter_obj *pao, int dsp_index)
                 /* PLL should not be bypassed! */
                 if ((boot_loader_read_mem32(pao, dsp_index, 0x01B7C100) & 0xF)
                         != 0x0001) {
-                        err = hpi6205_error(dsp_index,
-                                HPI6205_ERROR_C6713_PLL);
-                        return err;
+                        return HPI6205_ERROR_C6713_PLL;
                 }
                 /* setup C67x EMIF  (note this is the only use of
                    BAR1 via BootLoader_WriteMem32) */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_GCTL,
                         0x000034A8);
+
+                /* EMIF CE0 setup - 2Mx32 Sync DRAM
+                   31..28       Wr setup
+                   27..22       Wr strobe
+                   21..20       Wr hold
+                   19..16       Rd setup
+                   15..14       -
+                   13..8        Rd strobe
+                   7..4         MTYPE   0011            Sync DRAM 32bits
+                   3            Wr hold MSB
+                   2..0         Rd hold
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_CE0,
                         0x00000030);
+
+                /* EMIF SDRAM Extension
+                   0x00
+                   31-21        0000b 0000b 000b
+                   20           WR2RD = 2cycles-1  = 1b
+
+                   19-18        WR2DEAC = 3cycle-1 = 10b
+                   17           WR2WR = 2cycle-1   = 1b
+                   16-15        R2WDQM = 4cycle-1  = 11b
+                   14-12        RD2WR = 6cycles-1  = 101b
+
+                   11-10        RD2DEAC = 4cycle-1 = 11b
+                   9            RD2RD = 2cycle-1   = 1b
+                   8-7          THZP = 3cycle-1    = 10b
+                   6-5          TWR  = 2cycle-1    = 01b (tWR = 17ns)
+                   4            TRRD = 2cycle      = 0b  (tRRD = 14ns)
+                   3-1          TRAS = 5cycle-1    = 100b (Tras=42ns)
+                   1            CAS latency = 3cyc = 1b
+                   (for Micron 2M32-7 operating at 100MHz)
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMEXT,
                         0x001BDF29);
+
+                /* EMIF SDRAM control - set up for a 2Mx32 SDRAM (512x32x4 bank)
+                   31           -       0b       -
+                   30           SDBSZ   1b              4 bank
+                   29..28       SDRSZ   00b             11 row address pins
+
+                   27..26       SDCSZ   01b             8 column address pins
+                   25           RFEN    1b              refersh enabled
+                   24           INIT    1b              init SDRAM!
+
+                   23..20       TRCD    0001b                   (Trcd/Tcyc)-1 = (20/10)-1 = 1
+
+                   19..16       TRP     0001b                   (Trp/Tcyc)-1 = (20/10)-1 = 1
+
+                   15..12       TRC     0110b                   (Trc/Tcyc)-1 = (70/10)-1 = 6
+
+                   11..0        -       0000b 0000b 0000b
+                 */
                 boot_loader_write_mem32(pao, dsp_index, C6713_EMIF_SDRAMCTL,
-                        0x47117000);
+                        0x47116000);
+
+                /* SDRAM refresh timing
+                   Need 4,096 refresh cycles every 64ms = 15.625us = 1562cycles of 100MHz = 0x61A
+                 */
                 boot_loader_write_mem32(pao, dsp_index,
                         C6713_EMIF_SDRAMTIMING, 0x00000410);
 
                 hpios_delay_micro_seconds(1000);
         } else if (dsp_index == 2) {
                 /* DSP 2 is a C6713 */
+        }
 
-        } else
-                err = hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
-        return err;
+        return 0;
 }
 
 static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
@@ -1896,7 +1845,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
                                 test_addr);
                         if (data != test_data) {
                                 HPI_DEBUG_LOG(VERBOSE,
-                                        "memtest error details  "
+                                        "Memtest error details  "
                                         "%08x %08x %08x %i\n", test_addr,
                                         test_data, data, dsp_index);
                                 return 1;       /* error */
@@ -1916,7 +1865,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index,
                 data = boot_loader_read_mem32(pao, dsp_index, test_addr);
                 if (data != test_data) {
                         HPI_DEBUG_LOG(VERBOSE,
-                                "memtest error details  "
+                                "Memtest error details  "
                                 "%08x %08x %08x %i\n", test_addr, test_data,
                                 data, dsp_index);
                         return 1;       /* error */
@@ -1946,8 +1895,8 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,
                         /* 64K data mem */
                         err = boot_loader_test_memory(pao, dsp_index,
                                 0x80000000, 0x10000);
-        } else if ((dsp_index == 1) || (dsp_index == 2)) {
-                /* DSP 1&2 are a C6713 */
+        } else if (dsp_index == 1) {
+                /* DSP 1 is a C6713 */
                 /* 192K internal mem */
                 err = boot_loader_test_memory(pao, dsp_index, 0x00000000,
                         0x30000);
@@ -1955,11 +1904,10 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao,
                         /* 64K internal mem / L2 cache */
                         err = boot_loader_test_memory(pao, dsp_index,
                                 0x00030000, 0x10000);
-        } else
-                return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
+        }
 
         if (err)
-                return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_INTMEM);
+                return HPI6205_ERROR_DSP_INTMEM;
         else
                 return 0;
 }
@@ -1972,24 +1920,23 @@ static u16 boot_loader_test_external_memory(struct hpi_adapter_obj *pao,
 
         if (dsp_index == 0) {
                 /* only test for SDRAM if an ASI5000 card */
-                if (pao->pci.subsys_device_id == 0x5000) {
+                if (pao->pci.pci_dev->subsystem_device == 0x5000) {
                         /* DSP 0 is always C6205 */
                         dRAM_start_address = 0x00400000;
                         dRAM_size = 0x200000;
                         /*dwDRAMinc=1024; */
                 } else
                         return 0;
-        } else if ((dsp_index == 1) || (dsp_index == 2)) {
+        } else if (dsp_index == 1) {
                 /* DSP 1 is a C6713 */
                 dRAM_start_address = 0x80000000;
                 dRAM_size = 0x200000;
                 /*dwDRAMinc=1024; */
-        } else
-                return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX);
+        }
 
         if (boot_loader_test_memory(pao, dsp_index, dRAM_start_address,
                         dRAM_size))
-                return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_EXTMEM);
+                return HPI6205_ERROR_DSP_EXTMEM;
         return 0;
 }
 
@@ -1998,28 +1945,25 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index)
         u32 data = 0;
         if (dsp_index == 0) {
                 /* only test for DSP0 PLD on ASI5000 card */
-                if (pao->pci.subsys_device_id == 0x5000) {
+                if (pao->pci.pci_dev->subsystem_device == 0x5000) {
                         /* PLD is located at CE3=0x03000000 */
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x03000008);
                         if ((data & 0xF) != 0x5)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x0300000C);
                         if ((data & 0xF) != 0xA)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                 }
         } else if (dsp_index == 1) {
                 /* DSP 1 is a C6713 */
-                if (pao->pci.subsys_device_id == 0x8700) {
+                if (pao->pci.pci_dev->subsystem_device == 0x8700) {
                         /* PLD is located at CE1=0x90000000 */
                         data = boot_loader_read_mem32(pao, dsp_index,
                                 0x90000010);
                         if ((data & 0xFF) != 0xAA)
-                                return hpi6205_error(dsp_index,
-                                        HPI6205_ERROR_DSP_PLD);
+                                return HPI6205_ERROR_DSP_PLD;
                         /* 8713 - LED on */
                         boot_loader_write_mem32(pao, dsp_index, 0x90000000,
                                 0x02);
@@ -2037,14 +1981,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
         struct hpi_hw_obj *phw = pao->priv;
         u32 data_transferred = 0;
         u16 err = 0;
-#ifndef HPI6205_NO_HSR_POLL
-        u32 time_out;
-#endif
         u32 temp2;
         struct bus_master_interface *interface = phw->p_interface_buffer;
 
         if (!p_data)
-                return HPI_ERROR_INVALID_DATA_TRANSFER;
+                return HPI_ERROR_INVALID_DATA_POINTER;
 
         data_size &= ~3L;       /* round data_size down to nearest 4 bytes */
 
@@ -2064,14 +2005,10 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
 
                 interface->transfer_size_in_bytes = this_copy;
 
-#ifdef HPI6205_NO_HSR_POLL
                 /* DSP must change this back to nOperation */
                 interface->dsp_ack = H620_HIF_IDLE;
-#endif
-
                 send_dsp_command(phw, operation);
 
-#ifdef HPI6205_NO_HSR_POLL
                 temp2 = wait_dsp_ack(phw, operation, HPI6205_TIMEOUT);
                 HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",
                         HPI6205_TIMEOUT - temp2, this_copy);
@@ -2079,45 +2016,11 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
                 if (!temp2) {
                         /* timed out */
                         HPI_DEBUG_LOG(ERROR,
-                                "timed out waiting for " "state %d got %d\n",
+                                "Timed out waiting for " "state %d got %d\n",
                                 operation, interface->dsp_ack);
 
                         break;
                 }
-#else
-                /* spin waiting on the result */
-                time_out = HPI6205_TIMEOUT;
-                temp2 = 0;
-                while ((temp2 == 0) && time_out--) {
-                        /* give 16k bus mastering transfer time to happen */
-                        /*(16k / 132Mbytes/s = 122usec) */
-                        hpios_delay_micro_seconds(20);
-                        temp2 = ioread32(phw->prHSR);
-                        temp2 &= C6205_HSR_INTSRC;
-                }
-                HPI_DEBUG_LOG(DEBUG, "spun %d times for data xfer of %d\n",
-                        HPI6205_TIMEOUT - time_out, this_copy);
-                if (temp2 == C6205_HSR_INTSRC) {
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "interrupt from HIF <data> OK\n");
-                        /*
-                           if(interface->dwDspAck != nOperation) {
-                           HPI_DEBUG_LOG(DEBUG("interface->dwDspAck=%d,
-                           expected %d \n",
-                           interface->dwDspAck,nOperation);
-                           }
-                         */
-                }
-/* need to handle this differently... */
-                else {
-                        HPI_DEBUG_LOG(ERROR,
-                                "interrupt from HIF <data> BAD\n");
-                        err = HPI_ERROR_DSP_HARDWARE;
-                }
-
-                /* reset the interrupt from the DSP */
-                iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
                 if (operation == H620_HIF_GET_DATA)
                         memcpy(&p_data[data_transferred],
                                 (void *)&interface->u.b_data[0], this_copy);
@@ -2174,31 +2077,39 @@ static unsigned int message_count;
 static u16 message_response_sequence(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-#ifndef HPI6205_NO_HSR_POLL
-        u32 temp2;
-#endif
         u32 time_out, time_out2;
         struct hpi_hw_obj *phw = pao->priv;
         struct bus_master_interface *interface = phw->p_interface_buffer;
         u16 err = 0;
 
         message_count++;
+        if (phm->size > sizeof(interface->u)) {
+                phr->error = HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL;
+                phr->specific_error = sizeof(interface->u);
+                phr->size = sizeof(struct hpi_response_header);
+                HPI_DEBUG_LOG(ERROR,
+                        "message len %d too big for buffer %zd \n", phm->size,
+                        sizeof(interface->u));
+                return 0;
+        }
+
         /* Assume buffer of type struct bus_master_interface
            is allocated "noncacheable" */
 
         if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {
                 HPI_DEBUG_LOG(DEBUG, "timeout waiting for idle\n");
-                return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);
+                return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;
         }
-        interface->u.message_buffer = *phm;
+
+        memcpy(&interface->u.message_buffer, phm, phm->size);
         /* signal we want a response */
         send_dsp_command(phw, H620_HIF_GET_RESP);
 
         time_out2 = wait_dsp_ack(phw, H620_HIF_GET_RESP, HPI6205_TIMEOUT);
 
-        if (time_out2 == 0) {
+        if (!time_out2) {
                 HPI_DEBUG_LOG(ERROR,
-                        "(%u) timed out waiting for " "GET_RESP state [%x]\n",
+                        "(%u) Timed out waiting for " "GET_RESP state [%x]\n",
                         message_count, interface->dsp_ack);
         } else {
                 HPI_DEBUG_LOG(VERBOSE,
@@ -2208,58 +2119,38 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao,
         /* spin waiting on HIF interrupt flag (end of msg process) */
         time_out = HPI6205_TIMEOUT;
 
-#ifndef HPI6205_NO_HSR_POLL
-        temp2 = 0;
-        while ((temp2 == 0) && --time_out) {
-                temp2 = ioread32(phw->prHSR);
-                temp2 &= C6205_HSR_INTSRC;
-                hpios_delay_micro_seconds(1);
-        }
-        if (temp2 == C6205_HSR_INTSRC) {
-                rmb();  /* ensure we see latest value for dsp_ack */
-                if ((interface->dsp_ack != H620_HIF_GET_RESP)) {
-                        HPI_DEBUG_LOG(DEBUG,
-                                "(%u)interface->dsp_ack(0x%x) != "
-                                "H620_HIF_GET_RESP, t=%u\n", message_count,
-                                interface->dsp_ack,
-                                HPI6205_TIMEOUT - time_out);
-                } else {
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "(%u)int with GET_RESP after %u\n",
-                                message_count, HPI6205_TIMEOUT - time_out);
+        /* read the result */
+        if (time_out) {
+                if (interface->u.response_buffer.size <= phr->size)
+                        memcpy(phr, &interface->u.response_buffer,
+                                interface->u.response_buffer.size);
+                else {
+                        HPI_DEBUG_LOG(ERROR,
+                                "response len %d too big for buffer %d\n",
+                                interface->u.response_buffer.size, phr->size);
+                        memcpy(phr, &interface->u.response_buffer,
+                                sizeof(struct hpi_response_header));
+                        phr->error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;
+                        phr->specific_error =
+                                interface->u.response_buffer.size;
+                        phr->size = sizeof(struct hpi_response_header);
                 }
-
-        } else {
-                /* can we do anything else in response to the error ? */
-                HPI_DEBUG_LOG(ERROR,
-                        "interrupt from HIF module BAD (function %x)\n",
-                        phm->function);
         }
-
-        /* reset the interrupt from the DSP */
-        iowrite32(C6205_HSR_INTSRC, phw->prHSR);
-#endif
-
-        /* read the result */
-        if (time_out != 0)
-                *phr = interface->u.response_buffer;
-
         /* set interface back to idle */
         send_dsp_command(phw, H620_HIF_IDLE);
 
-        if ((time_out == 0) || (time_out2 == 0)) {
+        if (!time_out || !time_out2) {
                 HPI_DEBUG_LOG(DEBUG, "something timed out!\n");
-                return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_TIMEOUT);
+                return HPI6205_ERROR_MSG_RESP_TIMEOUT;
         }
         /* special case for adapter close - */
         /* wait for the DSP to indicate it is idle */
         if (phm->function == HPI_ADAPTER_CLOSE) {
                 if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) {
                         HPI_DEBUG_LOG(DEBUG,
-                                "timeout waiting for idle "
+                                "Timeout waiting for idle "
                                 "(on adapter_close)\n");
-                        return hpi6205_error(0,
-                                HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT);
+                        return HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT;
                 }
         }
         err = hpi_validate_response(phm, phr);
@@ -2279,7 +2170,13 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
         /* maybe an error response */
         if (err) {
                 /* something failed in the HPI/DSP interface */
-                phr->error = err;
+                if (err >= HPI_ERROR_BACKEND_BASE) {
+                        phr->error = HPI_ERROR_DSP_COMMUNICATION;
+                        phr->specific_error = err;
+                } else {
+                        phr->error = err;
+                }
+
                 pao->dsp_crashed++;
 
                 /* just the header of the response is valid */
diff --git a/sound/pci/asihpi/hpi6205.h b/sound/pci/asihpi/hpi6205.h
index 1adae0857cda..df2f02c0c7b4 100644
--- a/sound/pci/asihpi/hpi6205.h
+++ b/sound/pci/asihpi/hpi6205.h
@@ -25,9 +25,6 @@ Copyright AudioScience, Inc., 2003
 #ifndef _HPI6205_H_
 #define _HPI6205_H_
 
-/* transitional conditional compile shared between host and DSP */
-/* #define HPI6205_NO_HSR_POLL */
-
 #include "hpi_internal.h"
 
 /***********************************************************
@@ -78,8 +75,8 @@ struct bus_master_interface {
         u32 dsp_ack;
         u32 transfer_size_in_bytes;
         union {
-                struct hpi_message message_buffer;
-                struct hpi_response response_buffer;
+                struct hpi_message_header message_buffer;
+                struct hpi_response_header response_buffer;
                 u8 b_data[HPI6205_SIZEOF_DATA];
         } u;
         struct controlcache_6205 control_cache;
diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index 16f502d459de..af678be0aa15 100644
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -28,7 +28,7 @@ HPI internal definitions
 /** maximum number of memory regions mapped to an adapter */
 #define HPI_MAX_ADAPTER_MEM_SPACES (2)
 
-/* Each OS needs its own hpios.h, or specific define as above */
+/* Each OS needs its own hpios.h */
 #include "hpios.h"
 
 /* physical memory allocation */
@@ -49,7 +49,7 @@ HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.
 */
 u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,
                                                            /**< memory handle */
-        u32 size, /**< size in bytes to allocate */
+        u32 size, /**< Size in bytes to allocate */
         struct pci_dev *p_os_reference
         /**< OS specific data required for memory allocation */
         );
@@ -96,41 +96,6 @@ typedef void hpi_handler_func(struct hpi_message *, struct hpi_response *);
 #define compile_time_assert(cond, msg) \
     typedef char ASSERT_##msg[(cond) ? 1 : -1]
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* Private HPI Entity related definitions                                     */
-
-#define STR_SIZE_FIELD_MAX 65535U
-#define STR_TYPE_FIELD_MAX 255U
-#define STR_ROLE_FIELD_MAX 255U
-
-struct hpi_entity_str {
-        u16 size;
-        u8 type;
-        u8 role;
-};
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4200)
-#endif
-
-struct hpi_entity {
-        struct hpi_entity_str header;
-#if ! defined(HPI_OS_DSP_C6000) || (defined(HPI_OS_DSP_C6000) && (__TI_COMPILER_VERSION__ > 6000008))
-        /* DSP C6000 compiler v6.0.8 and lower
-           do not support  flexible array member */
-        u8 value[];
-#else
-        /* NOTE! Using sizeof(struct hpi_entity) will give erroneous results */
-#define HPI_INTERNAL_WARN_ABOUT_ENTITY_VALUE
-        u8 value[1];
-#endif
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 /******************************************* bus types */
 enum HPI_BUSES {
         HPI_BUS_ISAPNP = 1,
@@ -139,206 +104,155 @@ enum HPI_BUSES {
         HPI_BUS_NET = 4
 };
 
+enum HPI_SUBSYS_OPTIONS {
+        /* 0, 256 are invalid, 1..255 reserved for global options */
+        HPI_SUBSYS_OPT_NET_ENABLE = 257,
+        HPI_SUBSYS_OPT_NET_BROADCAST = 258,
+        HPI_SUBSYS_OPT_NET_UNICAST = 259,
+        HPI_SUBSYS_OPT_NET_ADDR = 260,
+        HPI_SUBSYS_OPT_NET_MASK = 261,
+        HPI_SUBSYS_OPT_NET_ADAPTER_ADDRESS_ADD = 262
+};
+
+/** Volume flags
+*/
+enum HPI_VOLUME_FLAGS {
+        /** Set if the volume control is muted */
+        HPI_VOLUME_FLAG_MUTED = (1 << 0),
+        /** Set if the volume control has a mute function */
+        HPI_VOLUME_FLAG_HAS_MUTE = (1 << 1),
+        /** Set if volume control can do autofading */
+        HPI_VOLUME_FLAG_HAS_AUTOFADE = (1 << 2)
+                /* Note Flags >= (1<<8) are for DSP internal use only */
+};
+
 /******************************************* CONTROL ATTRIBUTES ****/
 /* (in order of control type ID */
 
 /* This allows for 255 control types, 256 unique attributes each */
-#define HPI_CTL_ATTR(ctl, ai) (HPI_CONTROL_##ctl * 0x100 + ai)
+#define HPI_CTL_ATTR(ctl, ai) ((HPI_CONTROL_##ctl << 8) + ai)
 
 /* Get the sub-index of the attribute for a control type */
-#define HPI_CTL_ATTR_INDEX(i) (i&0xff)
+#define HPI_CTL_ATTR_INDEX(i) (i & 0xff)
 
 /* Extract the control from the control attribute */
-#define HPI_CTL_ATTR_CONTROL(i) (i>>8)
-
-/* Generic control attributes.  */
-
-/** Enable a control.
-0=disable, 1=enable
-\note generic to all mixer plugins?
-*/
-#define HPI_GENERIC_ENABLE HPI_CTL_ATTR(GENERIC, 1)
+#define HPI_CTL_ATTR_CONTROL(i) (i >> 8)
 
 /** Enable event generation for a control.
 0=disable, 1=enable
 \note generic to all controls that can generate events
 */
-#define HPI_GENERIC_EVENT_ENABLE HPI_CTL_ATTR(GENERIC, 2)
-
-/* Volume Control attributes */
-#define HPI_VOLUME_GAIN                 HPI_CTL_ATTR(VOLUME, 1)
-#define HPI_VOLUME_AUTOFADE             HPI_CTL_ATTR(VOLUME, 2)
-
-/** For HPI_ControlQuery() to get the number of channels of a volume control*/
-#define HPI_VOLUME_NUM_CHANNELS         HPI_CTL_ATTR(VOLUME, 6)
-#define HPI_VOLUME_RANGE                HPI_CTL_ATTR(VOLUME, 10)
-
-/** Level Control attributes */
-#define HPI_LEVEL_GAIN                  HPI_CTL_ATTR(LEVEL, 1)
-#define HPI_LEVEL_RANGE                 HPI_CTL_ATTR(LEVEL, 10)
-
-/* Meter Control attributes */
-/** return RMS signal level */
-#define HPI_METER_RMS                   HPI_CTL_ATTR(METER, 1)
-/** return peak signal level */
-#define HPI_METER_PEAK                  HPI_CTL_ATTR(METER, 2)
-/** ballistics for ALL rms meters on adapter */
-#define HPI_METER_RMS_BALLISTICS        HPI_CTL_ATTR(METER, 3)
-/** ballistics for ALL peak meters on adapter */
-#define HPI_METER_PEAK_BALLISTICS       HPI_CTL_ATTR(METER, 4)
-
-/** For HPI_ControlQuery() to get the number of channels of a meter control*/
-#define HPI_METER_NUM_CHANNELS          HPI_CTL_ATTR(METER, 5)
-
-/* Multiplexer control attributes */
-#define HPI_MULTIPLEXER_SOURCE          HPI_CTL_ATTR(MULTIPLEXER, 1)
-#define HPI_MULTIPLEXER_QUERYSOURCE     HPI_CTL_ATTR(MULTIPLEXER, 2)
-
-/** AES/EBU transmitter control attributes */
-/** AESEBU or SPDIF */
-#define HPI_AESEBUTX_FORMAT             HPI_CTL_ATTR(AESEBUTX, 1)
-#define HPI_AESEBUTX_SAMPLERATE         HPI_CTL_ATTR(AESEBUTX, 3)
-#define HPI_AESEBUTX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBUTX, 4)
-#define HPI_AESEBUTX_USERDATA           HPI_CTL_ATTR(AESEBUTX, 5)
-
-/** AES/EBU receiver control attributes */
-#define HPI_AESEBURX_FORMAT             HPI_CTL_ATTR(AESEBURX, 1)
-#define HPI_AESEBURX_ERRORSTATUS        HPI_CTL_ATTR(AESEBURX, 2)
-#define HPI_AESEBURX_SAMPLERATE         HPI_CTL_ATTR(AESEBURX, 3)
-#define HPI_AESEBURX_CHANNELSTATUS      HPI_CTL_ATTR(AESEBURX, 4)
-#define HPI_AESEBURX_USERDATA           HPI_CTL_ATTR(AESEBURX, 5)
-
-/** \defgroup tuner_defs Tuners
-\{
-*/
-/** \defgroup tuner_attrs Tuner control attributes
-\{
-*/
-#define HPI_TUNER_BAND                  HPI_CTL_ATTR(TUNER, 1)
-#define HPI_TUNER_FREQ                  HPI_CTL_ATTR(TUNER, 2)
-#define HPI_TUNER_LEVEL                 HPI_CTL_ATTR(TUNER, 3)
-#define HPI_TUNER_AUDIOMUTE             HPI_CTL_ATTR(TUNER, 4)
-/* use TUNER_STATUS instead */
-#define HPI_TUNER_VIDEO_STATUS          HPI_CTL_ATTR(TUNER, 5)
-#define HPI_TUNER_GAIN                  HPI_CTL_ATTR(TUNER, 6)
-#define HPI_TUNER_STATUS                HPI_CTL_ATTR(TUNER, 7)
-#define HPI_TUNER_MODE                  HPI_CTL_ATTR(TUNER, 8)
-/** RDS data. */
-#define HPI_TUNER_RDS                   HPI_CTL_ATTR(TUNER, 9)
-/** Audio pre-emphasis. */
-#define HPI_TUNER_DEEMPHASIS            HPI_CTL_ATTR(TUNER, 10)
-/** HD Radio tuner program control. */
-#define HPI_TUNER_PROGRAM               HPI_CTL_ATTR(TUNER, 11)
-/** HD Radio tuner digital signal quality. */
-#define HPI_TUNER_HDRADIO_SIGNAL_QUALITY        HPI_CTL_ATTR(TUNER, 12)
-/** HD Radio SDK firmware version. */
-#define HPI_TUNER_HDRADIO_SDK_VERSION   HPI_CTL_ATTR(TUNER, 13)
-/** HD Radio DSP firmware version. */
-#define HPI_TUNER_HDRADIO_DSP_VERSION   HPI_CTL_ATTR(TUNER, 14)
-/** HD Radio signal blend (force analog, or automatic). */
-#define HPI_TUNER_HDRADIO_BLEND         HPI_CTL_ATTR(TUNER, 15)
-
-/** \} */
-
-/** \defgroup pads_attrs Tuner PADs control attributes
-\{
-*/
-/** The text string containing the station/channel combination. */
-#define HPI_PAD_CHANNEL_NAME            HPI_CTL_ATTR(PAD, 1)
-/** The text string containing the artist. */
-#define HPI_PAD_ARTIST                  HPI_CTL_ATTR(PAD, 2)
-/** The text string containing the title. */
-#define HPI_PAD_TITLE                   HPI_CTL_ATTR(PAD, 3)
-/** The text string containing the comment. */
-#define HPI_PAD_COMMENT                 HPI_CTL_ATTR(PAD, 4)
-/** The integer containing the PTY code. */
-#define HPI_PAD_PROGRAM_TYPE            HPI_CTL_ATTR(PAD, 5)
-/** The integer containing the program identification. */
-#define HPI_PAD_PROGRAM_ID              HPI_CTL_ATTR(PAD, 6)
-/** The integer containing whether traffic information is supported.
-Contains either 1 or 0. */
-#define HPI_PAD_TA_SUPPORT              HPI_CTL_ATTR(PAD, 7)
-/** The integer containing whether traffic announcement is in progress.
-Contains either 1 or 0. */
-#define HPI_PAD_TA_ACTIVE               HPI_CTL_ATTR(PAD, 8)
-/** \} */
-/** \} */
-
-/* VOX control attributes */
-#define HPI_VOX_THRESHOLD               HPI_CTL_ATTR(VOX, 1)
-
-/*?? channel mode used hpi_multiplexer_source attribute == 1 */
-#define HPI_CHANNEL_MODE_MODE HPI_CTL_ATTR(CHANNEL_MODE, 1)
-
-/** \defgroup channel_modes Channel Modes
-Used for HPI_ChannelModeSet/Get()
-\{
+
+/** Unique identifiers for every control attribute
 */
-/** Left channel out = left channel in, Right channel out = right channel in. */
-#define HPI_CHANNEL_MODE_NORMAL                 1
-/** Left channel out = right channel in, Right channel out = left channel in. */
-#define HPI_CHANNEL_MODE_SWAP                   2
-/** Left channel out = left channel in, Right channel out = left channel in. */
-#define HPI_CHANNEL_MODE_LEFT_TO_STEREO         3
-/** Left channel out = right channel in, Right channel out = right channel in.*/
-#define HPI_CHANNEL_MODE_RIGHT_TO_STEREO        4
-/** Left channel out = (left channel in + right channel in)/2,
-    Right channel out = mute. */
-#define HPI_CHANNEL_MODE_STEREO_TO_LEFT         5
-/** Left channel out = mute,
-    Right channel out = (right channel in + left channel in)/2. */
-#define HPI_CHANNEL_MODE_STEREO_TO_RIGHT        6
-#define HPI_CHANNEL_MODE_LAST                   6
-/** \} */
-
-/* Bitstream control set attributes */
-#define HPI_BITSTREAM_DATA_POLARITY     HPI_CTL_ATTR(BITSTREAM, 1)
-#define HPI_BITSTREAM_CLOCK_EDGE        HPI_CTL_ATTR(BITSTREAM, 2)
-#define HPI_BITSTREAM_CLOCK_SOURCE      HPI_CTL_ATTR(BITSTREAM, 3)
+enum HPI_CONTROL_ATTRIBUTES {
+        HPI_GENERIC_ENABLE = HPI_CTL_ATTR(GENERIC, 1),
+        HPI_GENERIC_EVENT_ENABLE = HPI_CTL_ATTR(GENERIC, 2),
+
+        HPI_VOLUME_GAIN = HPI_CTL_ATTR(VOLUME, 1),
+        HPI_VOLUME_AUTOFADE = HPI_CTL_ATTR(VOLUME, 2),
+        HPI_VOLUME_MUTE = HPI_CTL_ATTR(VOLUME, 3),
+        HPI_VOLUME_GAIN_AND_FLAGS = HPI_CTL_ATTR(VOLUME, 4),
+        HPI_VOLUME_NUM_CHANNELS = HPI_CTL_ATTR(VOLUME, 6),
+        HPI_VOLUME_RANGE = HPI_CTL_ATTR(VOLUME, 10),
+
+        HPI_METER_RMS = HPI_CTL_ATTR(METER, 1),
+        HPI_METER_PEAK = HPI_CTL_ATTR(METER, 2),
+        HPI_METER_RMS_BALLISTICS = HPI_CTL_ATTR(METER, 3),
+        HPI_METER_PEAK_BALLISTICS = HPI_CTL_ATTR(METER, 4),
+        HPI_METER_NUM_CHANNELS = HPI_CTL_ATTR(METER, 5),
+
+        HPI_MULTIPLEXER_SOURCE = HPI_CTL_ATTR(MULTIPLEXER, 1),
+        HPI_MULTIPLEXER_QUERYSOURCE = HPI_CTL_ATTR(MULTIPLEXER, 2),
+
+        HPI_AESEBUTX_FORMAT = HPI_CTL_ATTR(AESEBUTX, 1),
+        HPI_AESEBUTX_SAMPLERATE = HPI_CTL_ATTR(AESEBUTX, 3),
+        HPI_AESEBUTX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBUTX, 4),
+        HPI_AESEBUTX_USERDATA = HPI_CTL_ATTR(AESEBUTX, 5),
+
+        HPI_AESEBURX_FORMAT = HPI_CTL_ATTR(AESEBURX, 1),
+        HPI_AESEBURX_ERRORSTATUS = HPI_CTL_ATTR(AESEBURX, 2),
+        HPI_AESEBURX_SAMPLERATE = HPI_CTL_ATTR(AESEBURX, 3),
+        HPI_AESEBURX_CHANNELSTATUS = HPI_CTL_ATTR(AESEBURX, 4),
+        HPI_AESEBURX_USERDATA = HPI_CTL_ATTR(AESEBURX, 5),
+
+        HPI_LEVEL_GAIN = HPI_CTL_ATTR(LEVEL, 1),
+        HPI_LEVEL_RANGE = HPI_CTL_ATTR(LEVEL, 10),
+
+        HPI_TUNER_BAND = HPI_CTL_ATTR(TUNER, 1),
+        HPI_TUNER_FREQ = HPI_CTL_ATTR(TUNER, 2),
+        HPI_TUNER_LEVEL_AVG = HPI_CTL_ATTR(TUNER, 3),
+        HPI_TUNER_LEVEL_RAW = HPI_CTL_ATTR(TUNER, 4),
+        HPI_TUNER_SNR = HPI_CTL_ATTR(TUNER, 5),
+        HPI_TUNER_GAIN = HPI_CTL_ATTR(TUNER, 6),
+        HPI_TUNER_STATUS = HPI_CTL_ATTR(TUNER, 7),
+        HPI_TUNER_MODE = HPI_CTL_ATTR(TUNER, 8),
+        HPI_TUNER_RDS = HPI_CTL_ATTR(TUNER, 9),
+        HPI_TUNER_DEEMPHASIS = HPI_CTL_ATTR(TUNER, 10),
+        HPI_TUNER_PROGRAM = HPI_CTL_ATTR(TUNER, 11),
+        HPI_TUNER_HDRADIO_SIGNAL_QUALITY = HPI_CTL_ATTR(TUNER, 12),
+        HPI_TUNER_HDRADIO_SDK_VERSION = HPI_CTL_ATTR(TUNER, 13),
+        HPI_TUNER_HDRADIO_DSP_VERSION = HPI_CTL_ATTR(TUNER, 14),
+        HPI_TUNER_HDRADIO_BLEND = HPI_CTL_ATTR(TUNER, 15),
+
+        HPI_VOX_THRESHOLD = HPI_CTL_ATTR(VOX, 1),
+
+        HPI_CHANNEL_MODE_MODE = HPI_CTL_ATTR(CHANNEL_MODE, 1),
+
+        HPI_BITSTREAM_DATA_POLARITY = HPI_CTL_ATTR(BITSTREAM, 1),
+        HPI_BITSTREAM_CLOCK_EDGE = HPI_CTL_ATTR(BITSTREAM, 2),
+        HPI_BITSTREAM_CLOCK_SOURCE = HPI_CTL_ATTR(BITSTREAM, 3),
+        HPI_BITSTREAM_ACTIVITY = HPI_CTL_ATTR(BITSTREAM, 4),
+
+        HPI_SAMPLECLOCK_SOURCE = HPI_CTL_ATTR(SAMPLECLOCK, 1),
+        HPI_SAMPLECLOCK_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 2),
+        HPI_SAMPLECLOCK_SOURCE_INDEX = HPI_CTL_ATTR(SAMPLECLOCK, 3),
+        HPI_SAMPLECLOCK_LOCAL_SAMPLERATE = HPI_CTL_ATTR(SAMPLECLOCK, 4),
+        HPI_SAMPLECLOCK_AUTO = HPI_CTL_ATTR(SAMPLECLOCK, 5),
+        HPI_SAMPLECLOCK_LOCAL_LOCK = HPI_CTL_ATTR(SAMPLECLOCK, 6),
+
+        HPI_MICROPHONE_PHANTOM_POWER = HPI_CTL_ATTR(MICROPHONE, 1),
+
+        HPI_EQUALIZER_NUM_FILTERS = HPI_CTL_ATTR(EQUALIZER, 1),
+        HPI_EQUALIZER_FILTER = HPI_CTL_ATTR(EQUALIZER, 2),
+        HPI_EQUALIZER_COEFFICIENTS = HPI_CTL_ATTR(EQUALIZER, 3),
+
+        HPI_COMPANDER_PARAMS = HPI_CTL_ATTR(COMPANDER, 1),
+        HPI_COMPANDER_MAKEUPGAIN = HPI_CTL_ATTR(COMPANDER, 2),
+        HPI_COMPANDER_THRESHOLD = HPI_CTL_ATTR(COMPANDER, 3),
+        HPI_COMPANDER_RATIO = HPI_CTL_ATTR(COMPANDER, 4),
+        HPI_COMPANDER_ATTACK = HPI_CTL_ATTR(COMPANDER, 5),
+        HPI_COMPANDER_DECAY = HPI_CTL_ATTR(COMPANDER, 6),
+
+        HPI_COBRANET_SET = HPI_CTL_ATTR(COBRANET, 1),
+        HPI_COBRANET_GET = HPI_CTL_ATTR(COBRANET, 2),
+        HPI_COBRANET_SET_DATA = HPI_CTL_ATTR(COBRANET, 3),
+        HPI_COBRANET_GET_DATA = HPI_CTL_ATTR(COBRANET, 4),
+        HPI_COBRANET_GET_STATUS = HPI_CTL_ATTR(COBRANET, 5),
+        HPI_COBRANET_SEND_PACKET = HPI_CTL_ATTR(COBRANET, 6),
+        HPI_COBRANET_GET_PACKET = HPI_CTL_ATTR(COBRANET, 7),
+
+        HPI_TONEDETECTOR_THRESHOLD = HPI_CTL_ATTR(TONEDETECTOR, 1),
+        HPI_TONEDETECTOR_STATE = HPI_CTL_ATTR(TONEDETECTOR, 2),
+        HPI_TONEDETECTOR_FREQUENCY = HPI_CTL_ATTR(TONEDETECTOR, 3),
+
+        HPI_SILENCEDETECTOR_THRESHOLD = HPI_CTL_ATTR(SILENCEDETECTOR, 1),
+        HPI_SILENCEDETECTOR_STATE = HPI_CTL_ATTR(SILENCEDETECTOR, 2),
+        HPI_SILENCEDETECTOR_DELAY = HPI_CTL_ATTR(SILENCEDETECTOR, 3),
+
+        HPI_PAD_CHANNEL_NAME = HPI_CTL_ATTR(PAD, 1),
+        HPI_PAD_ARTIST = HPI_CTL_ATTR(PAD, 2),
+        HPI_PAD_TITLE = HPI_CTL_ATTR(PAD, 3),
+        HPI_PAD_COMMENT = HPI_CTL_ATTR(PAD, 4),
+        HPI_PAD_PROGRAM_TYPE = HPI_CTL_ATTR(PAD, 5),
+        HPI_PAD_PROGRAM_ID = HPI_CTL_ATTR(PAD, 6),
+        HPI_PAD_TA_SUPPORT = HPI_CTL_ATTR(PAD, 7),
+        HPI_PAD_TA_ACTIVE = HPI_CTL_ATTR(PAD, 8)
+};
 
 #define HPI_POLARITY_POSITIVE           0
 #define HPI_POLARITY_NEGATIVE           1
 
-/* Bitstream control get attributes */
-#define HPI_BITSTREAM_ACTIVITY          1
-
-/* SampleClock control attributes */
-#define HPI_SAMPLECLOCK_SOURCE                  HPI_CTL_ATTR(SAMPLECLOCK, 1)
-#define HPI_SAMPLECLOCK_SAMPLERATE              HPI_CTL_ATTR(SAMPLECLOCK, 2)
-#define HPI_SAMPLECLOCK_SOURCE_INDEX            HPI_CTL_ATTR(SAMPLECLOCK, 3)
-#define HPI_SAMPLECLOCK_LOCAL_SAMPLERATE\
-        HPI_CTL_ATTR(SAMPLECLOCK, 4)
-#define HPI_SAMPLECLOCK_AUTO                    HPI_CTL_ATTR(SAMPLECLOCK, 5)
-#define HPI_SAMPLECLOCK_LOCAL_LOCK                      HPI_CTL_ATTR(SAMPLECLOCK, 6)
-
-/* Microphone control attributes */
-#define HPI_MICROPHONE_PHANTOM_POWER HPI_CTL_ATTR(MICROPHONE, 1)
-
-/** Equalizer control attributes */
-/** Used to get number of filters in an EQ. (Can't set) */
-#define HPI_EQUALIZER_NUM_FILTERS HPI_CTL_ATTR(EQUALIZER, 1)
-/** Set/get the filter by type, freq, Q, gain */
-#define HPI_EQUALIZER_FILTER HPI_CTL_ATTR(EQUALIZER, 2)
-/** Get the biquad coefficients */
-#define HPI_EQUALIZER_COEFFICIENTS HPI_CTL_ATTR(EQUALIZER, 3)
-
-/* Note compander also uses HPI_GENERIC_ENABLE */
-#define HPI_COMPANDER_PARAMS     HPI_CTL_ATTR(COMPANDER, 1)
-#define HPI_COMPANDER_MAKEUPGAIN HPI_CTL_ATTR(COMPANDER, 2)
-#define HPI_COMPANDER_THRESHOLD  HPI_CTL_ATTR(COMPANDER, 3)
-#define HPI_COMPANDER_RATIO      HPI_CTL_ATTR(COMPANDER, 4)
-#define HPI_COMPANDER_ATTACK     HPI_CTL_ATTR(COMPANDER, 5)
-#define HPI_COMPANDER_DECAY      HPI_CTL_ATTR(COMPANDER, 6)
-
-/* Cobranet control attributes. */
-#define HPI_COBRANET_SET         HPI_CTL_ATTR(COBRANET, 1)
-#define HPI_COBRANET_GET         HPI_CTL_ATTR(COBRANET, 2)
-#define HPI_COBRANET_SET_DATA    HPI_CTL_ATTR(COBRANET, 3)
-#define HPI_COBRANET_GET_DATA    HPI_CTL_ATTR(COBRANET, 4)
-#define HPI_COBRANET_GET_STATUS  HPI_CTL_ATTR(COBRANET, 5)
-#define HPI_COBRANET_SEND_PACKET HPI_CTL_ATTR(COBRANET, 6)
-#define HPI_COBRANET_GET_PACKET  HPI_CTL_ATTR(COBRANET, 7)
-
 /*------------------------------------------------------------
  Cobranet Chip Bridge - copied from HMI.H
 ------------------------------------------------------------*/
@@ -395,69 +309,22 @@ Used for HPI_ChannelModeSet/Get()
 
 #define HPI_ETHERNET_UDP_PORT (44600)   /*!< UDP messaging port */
 
-/** Base network time out is set to 100 milli-seconds. */
-#define HPI_ETHERNET_TIMEOUT_MS      (100)
-
-/** \defgroup tonedet_attr Tonedetector attributes
-\{
-Used by HPI_ToneDetector_Set() and HPI_ToneDetector_Get()
-*/
-
-/** Set the threshold level of a tonedetector,
-Threshold is a -ve number in units of dB/100,
-*/
-#define HPI_TONEDETECTOR_THRESHOLD HPI_CTL_ATTR(TONEDETECTOR, 1)
-
-/** Get the current state of tonedetection
-The result is a bitmap of detected tones.  pairs of bits represent the left
-and right channels, with left channel in LSB.
-The lowest frequency detector state is in the LSB
-*/
-#define HPI_TONEDETECTOR_STATE HPI_CTL_ATTR(TONEDETECTOR, 2)
-
-/** Get the frequency of a tonedetector band.
-*/
-#define HPI_TONEDETECTOR_FREQUENCY HPI_CTL_ATTR(TONEDETECTOR, 3)
-
-/**\}*/
+/** Default network timeout in milli-seconds. */
+#define HPI_ETHERNET_TIMEOUT_MS 500
 
-/** \defgroup silencedet_attr SilenceDetector attributes
-\{
-*/
-
-/** Get the current state of tonedetection
-The result is a bitmap with 1s for silent channels. Left channel is in LSB
-*/
-#define HPI_SILENCEDETECTOR_STATE \
-  HPI_CTL_ATTR(SILENCEDETECTOR, 2)
-
-/** Set the threshold level of a SilenceDetector,
-Threshold is a -ve number in units of dB/100,
-*/
-#define HPI_SILENCEDETECTOR_THRESHOLD \
-  HPI_CTL_ATTR(SILENCEDETECTOR, 1)
-
-/** get/set the silence time before the detector triggers
-*/
-#define HPI_SILENCEDETECTOR_DELAY \
-       HPI_CTL_ATTR(SILENCEDETECTOR, 3)
-
-/**\}*/
-
-/* Locked memory buffer alloc/free phases */
-/** use one message to allocate or free physical memory */
-#define HPI_BUFFER_CMD_EXTERNAL                 0
-/** alloc physical memory */
-#define HPI_BUFFER_CMD_INTERNAL_ALLOC           1
-/** send physical memory address to adapter */
-#define HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER    2
-/** notify adapter to stop using physical buffer */
-#define HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER   3
-/** free physical buffer */
-#define HPI_BUFFER_CMD_INTERNAL_FREE            4
-
-/******************************************* CONTROLX ATTRIBUTES ****/
-/* NOTE: All controlx attributes must be unique, unlike control attributes */
+/** Locked memory buffer alloc/free phases */
+enum HPI_BUFFER_CMDS {
+        /** use one message to allocate or free physical memory */
+        HPI_BUFFER_CMD_EXTERNAL = 0,
+        /** alloc physical memory */
+        HPI_BUFFER_CMD_INTERNAL_ALLOC = 1,
+        /** send physical memory address to adapter */
+        HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER = 2,
+        /** notify adapter to stop using physical buffer */
+        HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER = 3,
+        /** free physical buffer */
+        HPI_BUFFER_CMD_INTERNAL_FREE = 4
+};
 
 /*****************************************************************************/
 /*****************************************************************************/
@@ -482,6 +349,12 @@ Threshold is a -ve number in units of dB/100,
 #define HPI_USB_W2K_TAG                 0x57495341      /* "ASIW"       */
 #define HPI_USB_LINUX_TAG               0x4C495341      /* "ASIL"       */
 
+/** Invalid Adapter index
+Used in HPI messages that are not addressed to a specific adapter
+Used in DLL to indicate device not present
+*/
+#define HPI_ADAPTER_INDEX_INVALID 0xFFFF
+
 /** First 2 hex digits define the adapter family */
 #define HPI_ADAPTER_FAMILY_MASK         0xff00
 #define HPI_MODULE_FAMILY_MASK          0xfff0
@@ -490,178 +363,185 @@ Threshold is a -ve number in units of dB/100,
 #define HPI_MODULE_FAMILY_ASI(f)   (f & HPI_MODULE_FAMILY_MASK)
 #define HPI_ADAPTER_ASI(f)   (f)
 
-/******************************************* message types */
-#define HPI_TYPE_MESSAGE                        1
-#define HPI_TYPE_RESPONSE                       2
-#define HPI_TYPE_DATA                           3
-#define HPI_TYPE_SSX2BYPASS_MESSAGE             4
-
-/******************************************* object types */
-#define HPI_OBJ_SUBSYSTEM                       1
-#define HPI_OBJ_ADAPTER                         2
-#define HPI_OBJ_OSTREAM                         3
-#define HPI_OBJ_ISTREAM                         4
-#define HPI_OBJ_MIXER                           5
-#define HPI_OBJ_NODE                            6
-#define HPI_OBJ_CONTROL                         7
-#define HPI_OBJ_NVMEMORY                        8
-#define HPI_OBJ_GPIO                            9
-#define HPI_OBJ_WATCHDOG                        10
-#define HPI_OBJ_CLOCK                           11
-#define HPI_OBJ_PROFILE                         12
-#define HPI_OBJ_CONTROLEX                       13
-#define HPI_OBJ_ASYNCEVENT                      14
-
-#define HPI_OBJ_MAXINDEX                        14
-
-/******************************************* methods/functions */
-
-#define HPI_OBJ_FUNCTION_SPACING        0x100
-#define HPI_MAKE_INDEX(obj, index) (obj * HPI_OBJ_FUNCTION_SPACING + index)
+enum HPI_MESSAGE_TYPES {
+        HPI_TYPE_MESSAGE = 1,
+        HPI_TYPE_RESPONSE = 2,
+        HPI_TYPE_DATA = 3,
+        HPI_TYPE_SSX2BYPASS_MESSAGE = 4
+};
+
+enum HPI_OBJECT_TYPES {
+        HPI_OBJ_SUBSYSTEM = 1,
+        HPI_OBJ_ADAPTER = 2,
+        HPI_OBJ_OSTREAM = 3,
+        HPI_OBJ_ISTREAM = 4,
+        HPI_OBJ_MIXER = 5,
+        HPI_OBJ_NODE = 6,
+        HPI_OBJ_CONTROL = 7,
+        HPI_OBJ_NVMEMORY = 8,
+        HPI_OBJ_GPIO = 9,
+        HPI_OBJ_WATCHDOG = 10,
+        HPI_OBJ_CLOCK = 11,
+        HPI_OBJ_PROFILE = 12,
+        HPI_OBJ_CONTROLEX = 13,
+        HPI_OBJ_ASYNCEVENT = 14
+#define HPI_OBJ_MAXINDEX 14
+};
+
+#define HPI_OBJ_FUNCTION_SPACING 0x100
+#define HPI_FUNC_ID(obj, i) (HPI_OBJ_##obj * HPI_OBJ_FUNCTION_SPACING + i)
+
 #define HPI_EXTRACT_INDEX(fn) (fn & 0xff)
 
-/* SUB-SYSTEM */
-#define HPI_SUBSYS_OPEN                 HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 1)
-#define HPI_SUBSYS_GET_VERSION          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 2)
-#define HPI_SUBSYS_GET_INFO             HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 3)
-#define HPI_SUBSYS_FIND_ADAPTERS        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 4)
-#define HPI_SUBSYS_CREATE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 5)
-#define HPI_SUBSYS_CLOSE                HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 6)
-#define HPI_SUBSYS_DELETE_ADAPTER       HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 7)
-#define HPI_SUBSYS_DRIVER_LOAD          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 8)
-#define HPI_SUBSYS_DRIVER_UNLOAD        HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 9)
-#define HPI_SUBSYS_READ_PORT_8          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 10)
-#define HPI_SUBSYS_WRITE_PORT_8         HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 11)
-#define HPI_SUBSYS_GET_NUM_ADAPTERS     HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 12)
-#define HPI_SUBSYS_GET_ADAPTER          HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 13)
-#define HPI_SUBSYS_SET_NETWORK_INTERFACE HPI_MAKE_INDEX(HPI_OBJ_SUBSYSTEM, 14)
-#define HPI_SUBSYS_FUNCTION_COUNT 14
-/* ADAPTER */
-#define HPI_ADAPTER_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 1)
-#define HPI_ADAPTER_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 2)
-#define HPI_ADAPTER_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 3)
-#define HPI_ADAPTER_GET_ASSERT          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 4)
-#define HPI_ADAPTER_TEST_ASSERT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 5)
-#define HPI_ADAPTER_SET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 6)
-#define HPI_ADAPTER_GET_MODE            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 7)
-#define HPI_ADAPTER_ENABLE_CAPABILITY   HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 8)
-#define HPI_ADAPTER_SELFTEST            HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 9)
-#define HPI_ADAPTER_FIND_OBJECT         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 10)
-#define HPI_ADAPTER_QUERY_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 11)
-#define HPI_ADAPTER_START_FLASH         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 12)
-#define HPI_ADAPTER_PROGRAM_FLASH       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 13)
-#define HPI_ADAPTER_SET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 14)
-#define HPI_ADAPTER_GET_PROPERTY        HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 15)
-#define HPI_ADAPTER_ENUM_PROPERTY       HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 16)
-#define HPI_ADAPTER_MODULE_INFO         HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 17)
-#define HPI_ADAPTER_DEBUG_READ          HPI_MAKE_INDEX(HPI_OBJ_ADAPTER, 18)
-#define HPI_ADAPTER_FUNCTION_COUNT 18
-/* OUTPUT STREAM */
-#define HPI_OSTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 1)
-#define HPI_OSTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 2)
-#define HPI_OSTREAM_WRITE               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 3)
-#define HPI_OSTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 4)
-#define HPI_OSTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 5)
-#define HPI_OSTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 6)
-#define HPI_OSTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 7)
-#define HPI_OSTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 8)
-#define HPI_OSTREAM_DATA                HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 9)
-#define HPI_OSTREAM_SET_VELOCITY        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 10)
-#define HPI_OSTREAM_SET_PUNCHINOUT      HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 11)
-#define HPI_OSTREAM_SINEGEN             HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 12)
-#define HPI_OSTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 13)
-#define HPI_OSTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 14)
-#define HPI_OSTREAM_ANC_READ            HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 15)
-#define HPI_OSTREAM_SET_TIMESCALE       HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 16)
-#define HPI_OSTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 17)
-#define HPI_OSTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 18)
-#define HPI_OSTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 19)
-#define HPI_OSTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 20)
-#define HPI_OSTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 21)
-#define HPI_OSTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 22)
-#define HPI_OSTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 23)
-#define HPI_OSTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_OSTREAM, 24)
-#define HPI_OSTREAM_FUNCTION_COUNT              24
-/* INPUT STREAM */
-#define HPI_ISTREAM_OPEN                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 1)
-#define HPI_ISTREAM_CLOSE               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 2)
-#define HPI_ISTREAM_SET_FORMAT          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 3)
-#define HPI_ISTREAM_READ                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 4)
-#define HPI_ISTREAM_START               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 5)
-#define HPI_ISTREAM_STOP                HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 6)
-#define HPI_ISTREAM_RESET               HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 7)
-#define HPI_ISTREAM_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 8)
-#define HPI_ISTREAM_QUERY_FORMAT        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 9)
-#define HPI_ISTREAM_ANC_RESET           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 10)
-#define HPI_ISTREAM_ANC_GET_INFO        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 11)
-#define HPI_ISTREAM_ANC_WRITE           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 12)
-#define HPI_ISTREAM_HOSTBUFFER_ALLOC    HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 13)
-#define HPI_ISTREAM_HOSTBUFFER_FREE     HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 14)
-#define HPI_ISTREAM_GROUP_ADD           HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 15)
-#define HPI_ISTREAM_GROUP_GETMAP        HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 16)
-#define HPI_ISTREAM_GROUP_RESET         HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 17)
-#define HPI_ISTREAM_HOSTBUFFER_GET_INFO HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 18)
-#define HPI_ISTREAM_WAIT_START          HPI_MAKE_INDEX(HPI_OBJ_ISTREAM, 19)
-#define HPI_ISTREAM_FUNCTION_COUNT              19
-/* MIXER */
+enum HPI_FUNCTION_IDS {
+        HPI_SUBSYS_OPEN = HPI_FUNC_ID(SUBSYSTEM, 1),
+        HPI_SUBSYS_GET_VERSION = HPI_FUNC_ID(SUBSYSTEM, 2),
+        HPI_SUBSYS_GET_INFO = HPI_FUNC_ID(SUBSYSTEM, 3),
+        HPI_SUBSYS_FIND_ADAPTERS = HPI_FUNC_ID(SUBSYSTEM, 4),
+        HPI_SUBSYS_CREATE_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 5),
+        HPI_SUBSYS_CLOSE = HPI_FUNC_ID(SUBSYSTEM, 6),
+        HPI_SUBSYS_DELETE_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 7),
+        HPI_SUBSYS_DRIVER_LOAD = HPI_FUNC_ID(SUBSYSTEM, 8),
+        HPI_SUBSYS_DRIVER_UNLOAD = HPI_FUNC_ID(SUBSYSTEM, 9),
+        HPI_SUBSYS_READ_PORT_8 = HPI_FUNC_ID(SUBSYSTEM, 10),
+        HPI_SUBSYS_WRITE_PORT_8 = HPI_FUNC_ID(SUBSYSTEM, 11),
+        HPI_SUBSYS_GET_NUM_ADAPTERS = HPI_FUNC_ID(SUBSYSTEM, 12),
+        HPI_SUBSYS_GET_ADAPTER = HPI_FUNC_ID(SUBSYSTEM, 13),
+        HPI_SUBSYS_SET_NETWORK_INTERFACE = HPI_FUNC_ID(SUBSYSTEM, 14),
+        HPI_SUBSYS_OPTION_INFO = HPI_FUNC_ID(SUBSYSTEM, 15),
+        HPI_SUBSYS_OPTION_GET = HPI_FUNC_ID(SUBSYSTEM, 16),
+        HPI_SUBSYS_OPTION_SET = HPI_FUNC_ID(SUBSYSTEM, 17),
+#define HPI_SUBSYS_FUNCTION_COUNT 17
+
+        HPI_ADAPTER_OPEN = HPI_FUNC_ID(ADAPTER, 1),
+        HPI_ADAPTER_CLOSE = HPI_FUNC_ID(ADAPTER, 2),
+        HPI_ADAPTER_GET_INFO = HPI_FUNC_ID(ADAPTER, 3),
+        HPI_ADAPTER_GET_ASSERT = HPI_FUNC_ID(ADAPTER, 4),
+        HPI_ADAPTER_TEST_ASSERT = HPI_FUNC_ID(ADAPTER, 5),
+        HPI_ADAPTER_SET_MODE = HPI_FUNC_ID(ADAPTER, 6),
+        HPI_ADAPTER_GET_MODE = HPI_FUNC_ID(ADAPTER, 7),
+        HPI_ADAPTER_ENABLE_CAPABILITY = HPI_FUNC_ID(ADAPTER, 8),
+        HPI_ADAPTER_SELFTEST = HPI_FUNC_ID(ADAPTER, 9),
+        HPI_ADAPTER_FIND_OBJECT = HPI_FUNC_ID(ADAPTER, 10),
+        HPI_ADAPTER_QUERY_FLASH = HPI_FUNC_ID(ADAPTER, 11),
+        HPI_ADAPTER_START_FLASH = HPI_FUNC_ID(ADAPTER, 12),
+        HPI_ADAPTER_PROGRAM_FLASH = HPI_FUNC_ID(ADAPTER, 13),
+        HPI_ADAPTER_SET_PROPERTY = HPI_FUNC_ID(ADAPTER, 14),
+        HPI_ADAPTER_GET_PROPERTY = HPI_FUNC_ID(ADAPTER, 15),
+        HPI_ADAPTER_ENUM_PROPERTY = HPI_FUNC_ID(ADAPTER, 16),
+        HPI_ADAPTER_MODULE_INFO = HPI_FUNC_ID(ADAPTER, 17),
+        HPI_ADAPTER_DEBUG_READ = HPI_FUNC_ID(ADAPTER, 18),
+        HPI_ADAPTER_IRQ_QUERY_AND_CLEAR = HPI_FUNC_ID(ADAPTER, 19),
+        HPI_ADAPTER_IRQ_CALLBACK = HPI_FUNC_ID(ADAPTER, 20),
+#define HPI_ADAPTER_FUNCTION_COUNT 20
+
+        HPI_OSTREAM_OPEN = HPI_FUNC_ID(OSTREAM, 1),
+        HPI_OSTREAM_CLOSE = HPI_FUNC_ID(OSTREAM, 2),
+        HPI_OSTREAM_WRITE = HPI_FUNC_ID(OSTREAM, 3),
+        HPI_OSTREAM_START = HPI_FUNC_ID(OSTREAM, 4),
+        HPI_OSTREAM_STOP = HPI_FUNC_ID(OSTREAM, 5),
+        HPI_OSTREAM_RESET = HPI_FUNC_ID(OSTREAM, 6),
+        HPI_OSTREAM_GET_INFO = HPI_FUNC_ID(OSTREAM, 7),
+        HPI_OSTREAM_QUERY_FORMAT = HPI_FUNC_ID(OSTREAM, 8),
+        HPI_OSTREAM_DATA = HPI_FUNC_ID(OSTREAM, 9),
+        HPI_OSTREAM_SET_VELOCITY = HPI_FUNC_ID(OSTREAM, 10),
+        HPI_OSTREAM_SET_PUNCHINOUT = HPI_FUNC_ID(OSTREAM, 11),
+        HPI_OSTREAM_SINEGEN = HPI_FUNC_ID(OSTREAM, 12),
+        HPI_OSTREAM_ANC_RESET = HPI_FUNC_ID(OSTREAM, 13),
+        HPI_OSTREAM_ANC_GET_INFO = HPI_FUNC_ID(OSTREAM, 14),
+        HPI_OSTREAM_ANC_READ = HPI_FUNC_ID(OSTREAM, 15),
+        HPI_OSTREAM_SET_TIMESCALE = HPI_FUNC_ID(OSTREAM, 16),
+        HPI_OSTREAM_SET_FORMAT = HPI_FUNC_ID(OSTREAM, 17),
+        HPI_OSTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(OSTREAM, 18),
+        HPI_OSTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(OSTREAM, 19),
+        HPI_OSTREAM_GROUP_ADD = HPI_FUNC_ID(OSTREAM, 20),
+        HPI_OSTREAM_GROUP_GETMAP = HPI_FUNC_ID(OSTREAM, 21),
+        HPI_OSTREAM_GROUP_RESET = HPI_FUNC_ID(OSTREAM, 22),
+        HPI_OSTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(OSTREAM, 23),
+        HPI_OSTREAM_WAIT_START = HPI_FUNC_ID(OSTREAM, 24),
+        HPI_OSTREAM_WAIT = HPI_FUNC_ID(OSTREAM, 25),
+#define HPI_OSTREAM_FUNCTION_COUNT 25
+
+        HPI_ISTREAM_OPEN = HPI_FUNC_ID(ISTREAM, 1),
+        HPI_ISTREAM_CLOSE = HPI_FUNC_ID(ISTREAM, 2),
+        HPI_ISTREAM_SET_FORMAT = HPI_FUNC_ID(ISTREAM, 3),
+        HPI_ISTREAM_READ = HPI_FUNC_ID(ISTREAM, 4),
+        HPI_ISTREAM_START = HPI_FUNC_ID(ISTREAM, 5),
+        HPI_ISTREAM_STOP = HPI_FUNC_ID(ISTREAM, 6),
+        HPI_ISTREAM_RESET = HPI_FUNC_ID(ISTREAM, 7),
+        HPI_ISTREAM_GET_INFO = HPI_FUNC_ID(ISTREAM, 8),
+        HPI_ISTREAM_QUERY_FORMAT = HPI_FUNC_ID(ISTREAM, 9),
+        HPI_ISTREAM_ANC_RESET = HPI_FUNC_ID(ISTREAM, 10),
+        HPI_ISTREAM_ANC_GET_INFO = HPI_FUNC_ID(ISTREAM, 11),
+        HPI_ISTREAM_ANC_WRITE = HPI_FUNC_ID(ISTREAM, 12),
+        HPI_ISTREAM_HOSTBUFFER_ALLOC = HPI_FUNC_ID(ISTREAM, 13),
+        HPI_ISTREAM_HOSTBUFFER_FREE = HPI_FUNC_ID(ISTREAM, 14),
+        HPI_ISTREAM_GROUP_ADD = HPI_FUNC_ID(ISTREAM, 15),
+        HPI_ISTREAM_GROUP_GETMAP = HPI_FUNC_ID(ISTREAM, 16),
+        HPI_ISTREAM_GROUP_RESET = HPI_FUNC_ID(ISTREAM, 17),
+        HPI_ISTREAM_HOSTBUFFER_GET_INFO = HPI_FUNC_ID(ISTREAM, 18),
+        HPI_ISTREAM_WAIT_START = HPI_FUNC_ID(ISTREAM, 19),
+        HPI_ISTREAM_WAIT = HPI_FUNC_ID(ISTREAM, 20),
+#define HPI_ISTREAM_FUNCTION_COUNT 20
+
 /* NOTE:
    GET_NODE_INFO, SET_CONNECTION, GET_CONNECTIONS are not currently used */
-#define HPI_MIXER_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 1)
-#define HPI_MIXER_CLOSE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 2)
-#define HPI_MIXER_GET_INFO              HPI_MAKE_INDEX(HPI_OBJ_MIXER, 3)
-#define HPI_MIXER_GET_NODE_INFO         HPI_MAKE_INDEX(HPI_OBJ_MIXER, 4)
-#define HPI_MIXER_GET_CONTROL           HPI_MAKE_INDEX(HPI_OBJ_MIXER, 5)
-#define HPI_MIXER_SET_CONNECTION        HPI_MAKE_INDEX(HPI_OBJ_MIXER, 6)
-#define HPI_MIXER_GET_CONNECTIONS       HPI_MAKE_INDEX(HPI_OBJ_MIXER, 7)
-#define HPI_MIXER_GET_CONTROL_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 8)
-#define HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX  HPI_MAKE_INDEX(HPI_OBJ_MIXER, 9)
-#define HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES HPI_MAKE_INDEX(HPI_OBJ_MIXER, 10)
-#define HPI_MIXER_STORE                 HPI_MAKE_INDEX(HPI_OBJ_MIXER, 11)
-#define HPI_MIXER_FUNCTION_COUNT        11
-/* MIXER CONTROLS */
-#define HPI_CONTROL_GET_INFO            HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 1)
-#define HPI_CONTROL_GET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 2)
-#define HPI_CONTROL_SET_STATE           HPI_MAKE_INDEX(HPI_OBJ_CONTROL, 3)
+        HPI_MIXER_OPEN = HPI_FUNC_ID(MIXER, 1),
+        HPI_MIXER_CLOSE = HPI_FUNC_ID(MIXER, 2),
+        HPI_MIXER_GET_INFO = HPI_FUNC_ID(MIXER, 3),
+        HPI_MIXER_GET_NODE_INFO = HPI_FUNC_ID(MIXER, 4),
+        HPI_MIXER_GET_CONTROL = HPI_FUNC_ID(MIXER, 5),
+        HPI_MIXER_SET_CONNECTION = HPI_FUNC_ID(MIXER, 6),
+        HPI_MIXER_GET_CONNECTIONS = HPI_FUNC_ID(MIXER, 7),
+        HPI_MIXER_GET_CONTROL_BY_INDEX = HPI_FUNC_ID(MIXER, 8),
+        HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX = HPI_FUNC_ID(MIXER, 9),
+        HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES = HPI_FUNC_ID(MIXER, 10),
+        HPI_MIXER_STORE = HPI_FUNC_ID(MIXER, 11),
+        HPI_MIXER_GET_CACHE_INFO = HPI_FUNC_ID(MIXER, 12),
+#define HPI_MIXER_FUNCTION_COUNT 12
+
+        HPI_CONTROL_GET_INFO = HPI_FUNC_ID(CONTROL, 1),
+        HPI_CONTROL_GET_STATE = HPI_FUNC_ID(CONTROL, 2),
+        HPI_CONTROL_SET_STATE = HPI_FUNC_ID(CONTROL, 3),
 #define HPI_CONTROL_FUNCTION_COUNT 3
-/* NONVOL MEMORY */
-#define HPI_NVMEMORY_OPEN               HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 1)
-#define HPI_NVMEMORY_READ_BYTE          HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 2)
-#define HPI_NVMEMORY_WRITE_BYTE         HPI_MAKE_INDEX(HPI_OBJ_NVMEMORY, 3)
+
+        HPI_NVMEMORY_OPEN = HPI_FUNC_ID(NVMEMORY, 1),
+        HPI_NVMEMORY_READ_BYTE = HPI_FUNC_ID(NVMEMORY, 2),
+        HPI_NVMEMORY_WRITE_BYTE = HPI_FUNC_ID(NVMEMORY, 3),
 #define HPI_NVMEMORY_FUNCTION_COUNT 3
-/* GPIO */
-#define HPI_GPIO_OPEN                   HPI_MAKE_INDEX(HPI_OBJ_GPIO, 1)
-#define HPI_GPIO_READ_BIT               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 2)
-#define HPI_GPIO_WRITE_BIT              HPI_MAKE_INDEX(HPI_OBJ_GPIO, 3)
-#define HPI_GPIO_READ_ALL               HPI_MAKE_INDEX(HPI_OBJ_GPIO, 4)
-#define HPI_GPIO_WRITE_STATUS           HPI_MAKE_INDEX(HPI_OBJ_GPIO, 5)
+
+        HPI_GPIO_OPEN = HPI_FUNC_ID(GPIO, 1),
+        HPI_GPIO_READ_BIT = HPI_FUNC_ID(GPIO, 2),
+        HPI_GPIO_WRITE_BIT = HPI_FUNC_ID(GPIO, 3),
+        HPI_GPIO_READ_ALL = HPI_FUNC_ID(GPIO, 4),
+        HPI_GPIO_WRITE_STATUS = HPI_FUNC_ID(GPIO, 5),
 #define HPI_GPIO_FUNCTION_COUNT 5
-/* ASYNC EVENT */
-#define HPI_ASYNCEVENT_OPEN             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 1)
-#define HPI_ASYNCEVENT_CLOSE            HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 2)
-#define HPI_ASYNCEVENT_WAIT             HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 3)
-#define HPI_ASYNCEVENT_GETCOUNT         HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 4)
-#define HPI_ASYNCEVENT_GET              HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 5)
-#define HPI_ASYNCEVENT_SENDEVENTS       HPI_MAKE_INDEX(HPI_OBJ_ASYNCEVENT, 6)
+
+        HPI_ASYNCEVENT_OPEN = HPI_FUNC_ID(ASYNCEVENT, 1),
+        HPI_ASYNCEVENT_CLOSE = HPI_FUNC_ID(ASYNCEVENT, 2),
+        HPI_ASYNCEVENT_WAIT = HPI_FUNC_ID(ASYNCEVENT, 3),
+        HPI_ASYNCEVENT_GETCOUNT = HPI_FUNC_ID(ASYNCEVENT, 4),
+        HPI_ASYNCEVENT_GET = HPI_FUNC_ID(ASYNCEVENT, 5),
+        HPI_ASYNCEVENT_SENDEVENTS = HPI_FUNC_ID(ASYNCEVENT, 6),
 #define HPI_ASYNCEVENT_FUNCTION_COUNT 6
-/* WATCH-DOG */
-#define HPI_WATCHDOG_OPEN               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 1)
-#define HPI_WATCHDOG_SET_TIME           HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 2)
-#define HPI_WATCHDOG_PING               HPI_MAKE_INDEX(HPI_OBJ_WATCHDOG, 3)
-/* CLOCK */
-#define HPI_CLOCK_OPEN                  HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 1)
-#define HPI_CLOCK_SET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 2)
-#define HPI_CLOCK_GET_TIME              HPI_MAKE_INDEX(HPI_OBJ_CLOCK, 3)
-/* PROFILE */
-#define HPI_PROFILE_OPEN_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 1)
-#define HPI_PROFILE_START_ALL           HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 2)
-#define HPI_PROFILE_STOP_ALL            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 3)
-#define HPI_PROFILE_GET                 HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 4)
-#define HPI_PROFILE_GET_IDLECOUNT       HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 5)
-#define HPI_PROFILE_GET_NAME            HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 6)
-#define HPI_PROFILE_GET_UTILIZATION     HPI_MAKE_INDEX(HPI_OBJ_PROFILE, 7)
+
+        HPI_WATCHDOG_OPEN = HPI_FUNC_ID(WATCHDOG, 1),
+        HPI_WATCHDOG_SET_TIME = HPI_FUNC_ID(WATCHDOG, 2),
+        HPI_WATCHDOG_PING = HPI_FUNC_ID(WATCHDOG, 3),
+
+        HPI_CLOCK_OPEN = HPI_FUNC_ID(CLOCK, 1),
+        HPI_CLOCK_SET_TIME = HPI_FUNC_ID(CLOCK, 2),
+        HPI_CLOCK_GET_TIME = HPI_FUNC_ID(CLOCK, 3),
+
+        HPI_PROFILE_OPEN_ALL = HPI_FUNC_ID(PROFILE, 1),
+        HPI_PROFILE_START_ALL = HPI_FUNC_ID(PROFILE, 2),
+        HPI_PROFILE_STOP_ALL = HPI_FUNC_ID(PROFILE, 3),
+        HPI_PROFILE_GET = HPI_FUNC_ID(PROFILE, 4),
+        HPI_PROFILE_GET_IDLECOUNT = HPI_FUNC_ID(PROFILE, 5),
+        HPI_PROFILE_GET_NAME = HPI_FUNC_ID(PROFILE, 6),
+        HPI_PROFILE_GET_UTILIZATION = HPI_FUNC_ID(PROFILE, 7)
 #define HPI_PROFILE_FUNCTION_COUNT 7
-/* ////////////////////////////////////////////////////////////////////// */
-/* PRIVATE ATTRIBUTES */
+};
 
 /* ////////////////////////////////////////////////////////////////////// */
 /* STRUCTURES */
@@ -672,18 +552,7 @@ Threshold is a -ve number in units of dB/100,
 /** PCI bus resource */
 struct hpi_pci {
         u32 __iomem *ap_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];
-        struct pci_dev *p_os_data;
-
-#ifndef HPI64BIT                /* keep structure size constant */
-        u32 padding[HPI_MAX_ADAPTER_MEM_SPACES + 1];
-#endif
-        u16 vendor_id;
-        u16 device_id;
-        u16 subsys_vendor_id;
-        u16 subsys_device_id;
-        u16 bus_number;
-        u16 device_number;
-        u32 interrupt;
+        struct pci_dev *pci_dev;
 };
 
 struct hpi_resource {
@@ -702,12 +571,10 @@ struct hpi_resource {
 /** Format info used inside struct hpi_message
     Not the same as public API struct hpi_format */
 struct hpi_msg_format {
-        u32 sample_rate;
-                                /**< 11025, 32000, 44100 ... */
-        u32 bit_rate;         /**< for MPEG */
-        u32 attributes;
-                                /**< Stereo/JointStereo/Mono */
-        u16 channels;         /**< 1,2..., (or ancillary mode or idle bit */
+        u32 sample_rate; /**< 11025, 32000, 44100 etc. */
+        u32 bit_rate; /**< for MPEG */
+        u32 attributes; /**< stereo/joint_stereo/mono */
+        u16 channels; /**< 1,2..., (or ancillary mode or idle bit */
         u16 format; /**< HPI_FORMAT_PCM16, _MPEG etc. see \ref HPI_FORMATS. */
 };
 
@@ -742,7 +609,7 @@ struct hpi_data_compat32 {
 struct hpi_buffer {
   /** placehoder for backward compatability (see dwBufferSize) */
         struct hpi_msg_format reserved;
-        u32 command;    /**< HPI_BUFFER_CMD_xxx*/
+        u32 command; /**< HPI_BUFFER_CMD_xxx*/
         u32 pci_address; /**< PCI physical address of buffer for DSP DMA */
         u32 buffer_size; /**< must line up with data_size of HPI_DATA*/
 };
@@ -777,30 +644,25 @@ struct hpi_subsys_msg {
 
 struct hpi_subsys_res {
         u32 version;
-        u32 data;               /* used to return extended version */
-        u16 num_adapters;       /* number of adapters */
+        u32 data;               /* extended version */
+        u16 num_adapters;
         u16 adapter_index;
-        u16 aw_adapter_list[HPI_MAX_ADAPTERS];
-};
-
-struct hpi_adapter_msg {
-        u32 adapter_mode;       /* adapter mode */
-        u16 assert_id;          /* assert number for "test assert" call
-                                   object_index for find object call
-                                   query_or_set for hpi_adapter_set_mode_ex() */
-        u16 object_type;        /* for adapter find object call */
+        u16 adapter_type;
+        u16 pad16;
 };
 
 union hpi_adapterx_msg {
-        struct hpi_adapter_msg adapter;
         struct {
-                u32 offset;
-        } query_flash;
+                u32 dsp_address;
+                u32 count_bytes;
+        } debug_read;
         struct {
-                u32 offset;
-                u32 length;
-                u32 key;
-        } start_flash;
+                u32 adapter_mode;
+                u16 query_or_set;
+        } mode;
+        struct {
+                u16 index;
+        } module_info;
         struct {
                 u32 checksum;
                 u16 sequence;
@@ -809,28 +671,41 @@ union hpi_adapterx_msg {
                 u16 unused;
         } program_flash;
         struct {
+                u16 index;
+                u16 what;
+                u16 property_index;
+        } property_enum;
+        struct {
                 u16 property;
                 u16 parameter1;
                 u16 parameter2;
         } property_set;
         struct {
-                u16 index;
-                u16 what;
-                u16 property_index;
-        } property_enum;
+                u32 offset;
+        } query_flash;
         struct {
-                u16 index;
-        } module_info;
+                u32 pad32;
+                u16 key1;
+                u16 key2;
+        } restart;
         struct {
-                u32 dsp_address;
-                u32 count_bytes;
-        } debug_read;
+                u32 offset;
+                u32 length;
+                u32 key;
+        } start_flash;
+        struct {
+                u32 pad32;
+                u16 value;
+        } test_assert;
+        struct {
+                u32 yes;
+        } irq_query;
 };
 
 struct hpi_adapter_res {
         u32 serial_number;
         u16 adapter_type;
-        u16 adapter_index;      /* is this needed? also used for dsp_index */
+        u16 adapter_index;
         u16 num_instreams;
         u16 num_outstreams;
         u16 num_mixers;
@@ -839,12 +714,18 @@ struct hpi_adapter_res {
 };
 
 union hpi_adapterx_res {
-        struct hpi_adapter_res adapter;
+        struct hpi_adapter_res info;
         struct {
-                u32 checksum;
-                u32 length;
-                u32 version;
-        } query_flash;
+                u32 p1;
+                u16 count;
+                u16 dsp_index;
+                u32 p2;
+                u32 dsp_msg_addr;
+                char sz_message[HPI_STRING_LEN];
+        } assert;
+        struct {
+                u32 adapter_mode;
+        } mode;
         struct {
                 u16 sequence;
         } program_flash;
@@ -852,6 +733,14 @@ union hpi_adapterx_res {
                 u16 parameter1;
                 u16 parameter2;
         } property_get;
+        struct {
+                u32 checksum;
+                u32 length;
+                u32 version;
+        } query_flash;
+        struct {
+                u32 yes;
+        } irq_query;
 };
 
 struct hpi_stream_msg {
@@ -863,6 +752,7 @@ struct hpi_stream_msg {
                 u32 time_scale;
                 struct hpi_buffer buffer;
                 struct hpi_streamid stream;
+                u32 threshold_bytes;
         } u;
 };
 
@@ -911,7 +801,7 @@ struct hpi_stream_res {
 struct hpi_mixer_msg {
         u16 control_index;
         u16 control_type;       /* = HPI_CONTROL_METER _VOLUME etc */
-        u16 padding1;           /* maintain alignment of subsequent fields */
+        u16 padding1;           /* Maintain alignment of subsequent fields */
         u16 node_type1;         /* = HPI_SOURCENODE_LINEIN etc */
         u16 node_index1;        /* = 0..N */
         u16 node_type2;
@@ -949,6 +839,11 @@ union hpi_mixerx_res {
                 u32 p_data;     /* pointer to data array */
                 u16 more_to_do; /* indicates if there is more to do */
         } gcabi;
+        struct {
+                u32 total_controls;     /* count of controls in the mixer */
+                u32 cache_controls;     /* count of controls in the cac */
+                u32 cache_bytes;        /* size of cache */
+        } cache_info;
 };
 
 struct hpi_control_msg {
@@ -1000,12 +895,16 @@ union hpi_control_union_res {
                 u32 band;
                 u32 frequency;
                 u32 gain;
-                u32 level;
                 u32 deemphasis;
                 struct {
                         u32 data[2];
                         u32 bLER;
                 } rds;
+                short s_level;
+                struct {
+                        u16 value;
+                        u16 mask;
+                } status;
         } tuner;
         struct {
                 char sz_data[8];
@@ -1178,11 +1077,11 @@ struct hpi_profile_res_open {
 };
 
 struct hpi_profile_res_time {
-        u32 micro_seconds;
+        u32 total_tick_count;
         u32 call_count;
-        u32 max_micro_seconds;
-        u32 min_micro_seconds;
-        u16 seconds;
+        u32 max_tick_count;
+        u32 ticks_per_millisecond;
+        u16 profile_interval;
 };
 
 struct hpi_profile_res_name {
@@ -1218,7 +1117,6 @@ struct hpi_message {
         u16 obj_index;          /*  */
         union {
                 struct hpi_subsys_msg s;
-                struct hpi_adapter_msg a;
                 union hpi_adapterx_msg ax;
                 struct hpi_stream_msg d;
                 struct hpi_mixer_msg m;
@@ -1239,7 +1137,7 @@ struct hpi_message {
 };
 
 #define HPI_MESSAGE_SIZE_BY_OBJECT { \
-        sizeof(struct hpi_message_header) ,   /* default, no object type 0 */ \
+        sizeof(struct hpi_message_header) ,   /* Default, no object type 0 */ \
         sizeof(struct hpi_message_header) + sizeof(struct hpi_subsys_msg),\
         sizeof(struct hpi_message_header) + sizeof(union hpi_adapterx_msg),\
         sizeof(struct hpi_message_header) + sizeof(struct hpi_stream_msg),\
@@ -1256,6 +1154,11 @@ struct hpi_message {
         sizeof(struct hpi_message_header) + sizeof(struct hpi_async_msg) \
 }
 
+/*
+Note that the wSpecificError error field should be inspected and potentially
+reported whenever HPI_ERROR_DSP_COMMUNICATION or HPI_ERROR_DSP_BOOTLOAD is
+returned in wError.
+*/
 struct hpi_response_header {
         u16 size;
         u8 type;                /* HPI_TYPE_RESPONSE  */
@@ -1277,7 +1180,6 @@ struct hpi_response {
         u16 specific_error;     /* adapter specific error */
         union {
                 struct hpi_subsys_res s;
-                struct hpi_adapter_res a;
                 union hpi_adapterx_res ax;
                 struct hpi_stream_res d;
                 struct hpi_mixer_res m;
@@ -1297,7 +1199,7 @@ struct hpi_response {
 };
 
 #define HPI_RESPONSE_SIZE_BY_OBJECT { \
-        sizeof(struct hpi_response_header) ,/* default, no object type 0 */ \
+        sizeof(struct hpi_response_header) ,/* Default, no object type 0 */ \
         sizeof(struct hpi_response_header) + sizeof(struct hpi_subsys_res),\
         sizeof(struct hpi_response_header) + sizeof(union  hpi_adapterx_res),\
         sizeof(struct hpi_response_header) + sizeof(struct hpi_stream_res),\
@@ -1314,7 +1216,7 @@ struct hpi_response {
         sizeof(struct hpi_response_header) + sizeof(struct hpi_async_res) \
 }
 
-/*********************** version 1 message/response *****************************/
+/*********************** version 1 message/response **************************/
 #define HPINET_ETHERNET_DATA_SIZE (1500)
 #define HPINET_IP_HDR_SIZE (20)
 #define HPINET_IP_DATA_SIZE (HPINET_ETHERNET_DATA_SIZE - HPINET_IP_HDR_SIZE)
@@ -1394,6 +1296,17 @@ struct hpi_res_adapter_program_flash {
                 sizeof(struct hpi_response_header) - sizeof(u16)];
 };
 
+struct hpi_msg_adapter_debug_read {
+        struct hpi_message_header h;
+        u32 dsp_address;
+        u32 count_bytes;
+};
+
+struct hpi_res_adapter_debug_read {
+        struct hpi_response_header h;
+        u8 bytes[256];
+};
+
 #if 1
 #define hpi_message_header_v1 hpi_message_header
 #define hpi_response_header_v1 hpi_response_header
@@ -1414,23 +1327,10 @@ struct hpi_response_header_v1 {
 };
 #endif
 
-/* STRV HPI Packet */
-struct hpi_msg_strv {
-        struct hpi_message_header h;
-        struct hpi_entity strv;
-};
-
-struct hpi_res_strv {
-        struct hpi_response_header h;
-        struct hpi_entity strv;
-};
-#define MIN_STRV_PACKET_SIZE sizeof(struct hpi_res_strv)
-
 struct hpi_msg_payload_v0 {
         struct hpi_message_header h;
         union {
                 struct hpi_subsys_msg s;
-                struct hpi_adapter_msg a;
                 union hpi_adapterx_msg ax;
                 struct hpi_stream_msg d;
                 struct hpi_mixer_msg m;
@@ -1451,7 +1351,6 @@ struct hpi_res_payload_v0 {
         struct hpi_response_header h;
         union {
                 struct hpi_subsys_res s;
-                struct hpi_adapter_res a;
                 union hpi_adapterx_res ax;
                 struct hpi_stream_res d;
                 struct hpi_mixer_res m;
@@ -1471,13 +1370,13 @@ struct hpi_res_payload_v0 {
 union hpi_message_buffer_v1 {
         struct hpi_message m0;  /* version 0 */
         struct hpi_message_header_v1 h;
-        unsigned char buf[HPI_MAX_PAYLOAD_SIZE];
+        u8 buf[HPI_MAX_PAYLOAD_SIZE];
 };
 
 union hpi_response_buffer_v1 {
         struct hpi_response r0; /* version 0 */
         struct hpi_response_header_v1 h;
-        unsigned char buf[HPI_MAX_PAYLOAD_SIZE];
+        u8 buf[HPI_MAX_PAYLOAD_SIZE];
 };
 
 compile_time_assert((sizeof(union hpi_message_buffer_v1) <=
@@ -1499,6 +1398,11 @@ struct hpi_control_defn {
 /*////////////////////////////////////////////////////////////////////////// */
 /* declarations for control caching (internal to HPI<->DSP interaction)      */
 
+/** indicates a cached u16 value is invalid. */
+#define HPI_CACHE_INVALID_UINT16 0xFFFF
+/** indicates a cached short value is invalid. */
+#define HPI_CACHE_INVALID_SHORT -32768
+
 /** A compact representation of (part of) a controls state.
 Used for efficient transfer of the control state
 between DSP and host or across a network
@@ -1512,58 +1416,104 @@ struct hpi_control_cache_info {
         u16 control_index;
 };
 
-struct hpi_control_cache_single {
+struct hpi_control_cache_vol {
+        struct hpi_control_cache_info i;
+        short an_log[2];
+        unsigned short flags;
+        char padding[2];
+};
+
+struct hpi_control_cache_meter {
+        struct hpi_control_cache_info i;
+        short an_log_peak[2];
+        short an_logRMS[2];
+};
+
+struct hpi_control_cache_channelmode {
+        struct hpi_control_cache_info i;
+        u16 mode;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_mux {
+        struct hpi_control_cache_info i;
+        u16 source_node_type;
+        u16 source_node_index;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_level {
         struct hpi_control_cache_info i;
+        short an_log[2];
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_tuner {
+        struct hpi_control_cache_info i;
+        u32 freq_ink_hz;
+        u16 band;
+        short s_level_avg;
+};
+
+struct hpi_control_cache_aes3rx {
+        struct hpi_control_cache_info i;
+        u32 error_status;
+        u32 format;
+};
+
+struct hpi_control_cache_aes3tx {
+        struct hpi_control_cache_info i;
+        u32 format;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_tonedetector {
+        struct hpi_control_cache_info i;
+        u16 state;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_silencedetector {
+        struct hpi_control_cache_info i;
+        u32 state;
+        char temp_padding[4];
+};
+
+struct hpi_control_cache_sampleclock {
+        struct hpi_control_cache_info i;
+        u16 source;
+        u16 source_index;
+        u32 sample_rate;
+};
+
+struct hpi_control_cache_microphone {
+        struct hpi_control_cache_info i;
+        u16 phantom_state;
+        char temp_padding[6];
+};
+
+struct hpi_control_cache_generic {
+        struct hpi_control_cache_info i;
+        u32 dw1;
+        u32 dw2;
+};
+
+struct hpi_control_cache_single {
         union {
-                struct {        /* volume */
-                        short an_log[2];
-                } v;
-                struct {        /* peak meter */
-                        short an_log_peak[2];
-                        short an_logRMS[2];
-                } p;
-                struct {        /* channel mode */
-                        u16 mode;
-                } m;
-                struct {        /* multiplexer */
-                        u16 source_node_type;
-                        u16 source_node_index;
-                } x;
-                struct {        /* level/trim */
-                        short an_log[2];
-                } l;
-                struct {        /* tuner - partial caching.
-                                   some attributes go to the DSP. */
-                        u32 freq_ink_hz;
-                        u16 band;
-                        u16 level;
-                } t;
-                struct {        /* AESEBU rx status */
-                        u32 error_status;
-                        u32 source;
-                } aes3rx;
-                struct {        /* AESEBU tx */
-                        u32 format;
-                } aes3tx;
-                struct {        /* tone detector */
-                        u16 state;
-                } tone;
-                struct {        /* silence detector */
-                        u32 state;
-                        u32 count;
-                } silence;
-                struct {        /* sample clock */
-                        u16 source;
-                        u16 source_index;
-                        u32 sample_rate;
-                } clk;
-                struct {        /* microphone control */
-                        u16 state;
-                } phantom_power;
-                struct {        /* generic control */
-                        u32 dw1;
-                        u32 dw2;
-                } g;
+                struct hpi_control_cache_info i;
+                struct hpi_control_cache_vol vol;
+                struct hpi_control_cache_meter meter;
+                struct hpi_control_cache_channelmode mode;
+                struct hpi_control_cache_mux mux;
+                struct hpi_control_cache_level level;
+                struct hpi_control_cache_tuner tuner;
+                struct hpi_control_cache_aes3rx aes3rx;
+                struct hpi_control_cache_aes3tx aes3tx;
+                struct hpi_control_cache_tonedetector tone;
+                struct hpi_control_cache_silencedetector silence;
+                struct hpi_control_cache_sampleclock clk;
+                struct hpi_control_cache_microphone microphone;
+                struct hpi_control_cache_generic generic;
         } u;
 };
 
@@ -1580,8 +1530,7 @@ struct hpi_control_cache_pad {
         u32 traffic_anouncement;
 };
 
-/*/////////////////////////////////////////////////////////////////////////// */
-/* declarations for 2^N sized FIFO buffer (internal to HPI<->DSP interaction) */
+/* 2^N sized FIFO buffer (internal to HPI<->DSP interaction) */
 struct hpi_fifo_buffer {
         u32 size;
         u32 dSP_index;
@@ -1606,25 +1555,18 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,
 /*////////////////////////////////////////////////////////////////////////// */
 
 /* main HPI entry point */
-hpi_handler_func hpi_send_recv;
-
-/* UDP message */
-void hpi_send_recvUDP(struct hpi_message *phm, struct hpi_response *phr,
-        const unsigned int timeout);
+void hpi_send_recv(struct hpi_message *phm, struct hpi_response *phr);
 
 /* used in PnP OS/driver */
-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,
-        const struct hpi_resource *p_resource, u16 *pw_adapter_index);
+u16 hpi_subsys_create_adapter(const struct hpi_resource *p_resource,
+        u16 *pw_adapter_index);
 
-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index);
+u16 hpi_subsys_delete_adapter(u16 adapter_index);
 
-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u8 **pp_buffer,
+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status);
 
-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u8 **pp_buffer,
+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status);
 
 u16 hpi_adapter_restart(u16 adapter_index);
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index d67f4d3db911..3e9c5c289764 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -26,6 +26,8 @@
 
 #include "hpi_internal.h"
 #include "hpidebug.h"
+#include "hpimsginit.h"
+
 #include "hpicmn.h"
 
 struct hpi_adapters_list {
@@ -43,14 +45,24 @@ static struct hpi_adapters_list adapters;
 **/
 u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr)
 {
-        u16 error = 0;
+        if (phr->type != HPI_TYPE_RESPONSE) {
+                HPI_DEBUG_LOG(ERROR, "header type %d invalid\n", phr->type);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
 
-        if ((phr->type != HPI_TYPE_RESPONSE)
-                || (phr->object != phm->object)
-                || (phr->function != phm->function))
-                error = HPI_ERROR_INVALID_RESPONSE;
+        if (phr->object != phm->object) {
+                HPI_DEBUG_LOG(ERROR, "header object %d invalid\n",
+                        phr->object);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
+
+        if (phr->function != phm->function) {
+                HPI_DEBUG_LOG(ERROR, "header type %d invalid\n",
+                        phr->function);
+                return HPI_ERROR_INVALID_RESPONSE;
+        }
 
-        return error;
+        return 0;
 }
 
 u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
@@ -66,8 +78,18 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
         }
 
         if (adapters.adapter[pao->index].adapter_type) {
-                {
-                        retval = HPI_DUPLICATE_ADAPTER_NUMBER;
+                int a;
+                for (a = HPI_MAX_ADAPTERS - 1; a >= 0; a--) {
+                        if (!adapters.adapter[a].adapter_type) {
+                                HPI_DEBUG_LOG(WARNING,
+                                        "ASI%X duplicate index %d moved to %d\n",
+                                        pao->adapter_type, pao->index, a);
+                                pao->index = a;
+                                break;
+                        }
+                }
+                if (a < 0) {
+                        retval = HPI_ERROR_DUPLICATE_ADAPTER_NUMBER;
                         goto unlock;
                 }
         }
@@ -76,17 +98,22 @@ u16 hpi_add_adapter(struct hpi_adapter_obj *pao)
         adapters.gw_num_adapters++;
 
 unlock:
-        hpios_alistlock_un_lock(&adapters);
+        hpios_alistlock_unlock(&adapters);
         return retval;
 }
 
 void hpi_delete_adapter(struct hpi_adapter_obj *pao)
 {
-        memset(pao, 0, sizeof(struct hpi_adapter_obj));
+        if (!pao->adapter_type) {
+                HPI_DEBUG_LOG(ERROR, "removing null adapter?\n");
+                return;
+        }
 
         hpios_alistlock_lock(&adapters);
-        adapters.gw_num_adapters--;     /* dec the number of adapters */
-        hpios_alistlock_un_lock(&adapters);
+        if (adapters.adapter[pao->index].adapter_type)
+                adapters.gw_num_adapters--;
+        memset(&adapters.adapter[pao->index], 0, sizeof(adapters.adapter[0]));
+        hpios_alistlock_unlock(&adapters);
 }
 
 /**
@@ -99,7 +126,7 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
         struct hpi_adapter_obj *pao = NULL;
 
         if (adapter_index >= HPI_MAX_ADAPTERS) {
-                HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d ",
+                HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d\n",
                         adapter_index);
                 return NULL;
         }
@@ -125,51 +152,34 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
 * wipe an HPI_ADAPTERS_LIST structure.
 *
 **/
-static void wipe_adapter_list(void
-        )
+static void wipe_adapter_list(void)
 {
         memset(&adapters, 0, sizeof(adapters));
 }
 
-/**
-* SubSysGetAdapters fills awAdapterList in an struct hpi_response structure
-* with all adapters in the given HPI_ADAPTERS_LIST.
-*
-*/
-static void subsys_get_adapters(struct hpi_response *phr)
+static void subsys_get_adapter(struct hpi_message *phm,
+        struct hpi_response *phr)
 {
-        /* fill in the response adapter array with the position */
-        /* identified by the adapter number/index of the adapters in */
-        /* this HPI */
-        /* i.e. if we have an A120 with it's jumper set to */
-        /* Adapter Number 2 then put an Adapter type A120 in the */
-        /* array in position 1 */
-        /* NOTE: AdapterNumber is 1..N, Index is 0..N-1 */
-
-        /* input:  NONE */
-        /* output: wNumAdapters */
-        /*                 awAdapter[] */
-        /* */
-
-        short i;
-        struct hpi_adapter_obj *pao = NULL;
+        int count = phm->obj_index;
+        u16 index = 0;
 
-        HPI_DEBUG_LOG(VERBOSE, "subsys_get_adapters\n");
-
-        /* for each adapter, place it's type in the position of the array */
-        /* corresponding to it's adapter number */
-        for (i = 0; i < adapters.gw_num_adapters; i++) {
-                pao = &adapters.adapter[i];
-                if (phr->u.s.aw_adapter_list[pao->index] != 0) {
-                        phr->error = HPI_DUPLICATE_ADAPTER_NUMBER;
-                        phr->specific_error = pao->index;
-                        return;
+        /* find the nCount'th nonzero adapter in array */
+        for (index = 0; index < HPI_MAX_ADAPTERS; index++) {
+                if (adapters.adapter[index].adapter_type) {
+                        if (!count)
+                                break;
+                        count--;
                 }
-                phr->u.s.aw_adapter_list[pao->index] = pao->adapter_type;
         }
 
-        phr->u.s.num_adapters = adapters.gw_num_adapters;
-        phr->error = 0; /* the function completed OK; */
+        if (index < HPI_MAX_ADAPTERS) {
+                phr->u.s.adapter_index = adapters.adapter[index].index;
+                phr->u.s.adapter_type = adapters.adapter[index].adapter_type;
+        } else {
+                phr->u.s.adapter_index = 0;
+                phr->u.s.adapter_type = 0;
+                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
+        }
 }
 
 static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
@@ -178,67 +188,98 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
         int cached = 0;
         if (!pC)
                 return 0;
-        if ((!pC->init) && (pC->p_cache != NULL) && (pC->control_count)
-                && (pC->cache_size_in_bytes)
-                ) {
-                u32 *p_master_cache;
-                pC->init = 1;
-
-                p_master_cache = (u32 *)pC->p_cache;
-                HPI_DEBUG_LOG(VERBOSE, "check %d controls\n",
+
+        if (pC->init)
+                return pC->init;
+
+        if (!pC->p_cache)
+                return 0;
+
+        if (pC->control_count && pC->cache_size_in_bytes) {
+                char *p_master_cache;
+                unsigned int byte_count = 0;
+
+                p_master_cache = (char *)pC->p_cache;
+                HPI_DEBUG_LOG(DEBUG, "check %d controls\n",
                         pC->control_count);
                 for (i = 0; i < pC->control_count; i++) {
                         struct hpi_control_cache_info *info =
                                 (struct hpi_control_cache_info *)
-                                p_master_cache;
+                                &p_master_cache[byte_count];
+
+                        if (!info->size_in32bit_words) {
+                                if (!i) {
+                                        HPI_DEBUG_LOG(INFO,
+                                                "adap %d cache not ready?\n",
+                                                pC->adap_idx);
+                                        return 0;
+                                }
+                                /* The cache is invalid.
+                                 * Minimum valid entry size is
+                                 * sizeof(struct hpi_control_cache_info)
+                                 */
+                                HPI_DEBUG_LOG(ERROR,
+                                        "adap %d zero size cache entry %d\n",
+                                        pC->adap_idx, i);
+                                break;
+                        }
 
                         if (info->control_type) {
-                                pC->p_info[i] = info;
+                                pC->p_info[info->control_index] = info;
                                 cached++;
-                        } else
-                                pC->p_info[i] = NULL;
+                        } else  /* dummy cache entry */
+                                pC->p_info[info->control_index] = NULL;
 
-                        if (info->size_in32bit_words)
-                                p_master_cache += info->size_in32bit_words;
-                        else
-                                p_master_cache +=
-                                        sizeof(struct
-                                        hpi_control_cache_single) /
-                                        sizeof(u32);
+                        byte_count += info->size_in32bit_words * 4;
 
                         HPI_DEBUG_LOG(VERBOSE,
-                                "cached %d, pinfo %p index %d type %d\n",
-                                cached, pC->p_info[i], info->control_index,
-                                info->control_type);
+                                "cached %d, pinfo %p index %d type %d size %d\n",
+                                cached, pC->p_info[info->control_index],
+                                info->control_index, info->control_type,
+                                info->size_in32bit_words);
+
+                        /* quit loop early if whole cache has been scanned.
+                         * dwControlCount is the maximum possible entries
+                         * but some may be absent from the cache
+                         */
+                        if (byte_count >= pC->cache_size_in_bytes)
+                                break;
+                        /* have seen last control index */
+                        if (info->control_index == pC->control_count - 1)
+                                break;
                 }
-                /*
-                   We didn't find anything to cache, so try again later !
-                 */
-                if (!cached)
-                        pC->init = 0;
+
+                if (byte_count != pC->cache_size_in_bytes)
+                        HPI_DEBUG_LOG(WARNING,
+                                "adap %d bytecount %d != cache size %d\n",
+                                pC->adap_idx, byte_count,
+                                pC->cache_size_in_bytes);
+                else
+                        HPI_DEBUG_LOG(DEBUG,
+                                "adap %d cache good, bytecount == cache size = %d\n",
+                                pC->adap_idx, byte_count);
+
+                pC->init = (u16)cached;
         }
         return pC->init;
 }
 
 /** Find a control.
 */
-static short find_control(struct hpi_message *phm,
-        struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI,
-        u16 *pw_control_index)
+static short find_control(u16 control_index,
+        struct hpi_control_cache *p_cache, struct hpi_control_cache_info **pI)
 {
-        *pw_control_index = phm->obj_index;
-
         if (!control_cache_alloc_check(p_cache)) {
                 HPI_DEBUG_LOG(VERBOSE,
-                        "control_cache_alloc_check() failed. adap%d ci%d\n",
-                        phm->adapter_index, *pw_control_index);
+                        "control_cache_alloc_check() failed %d\n",
+                        control_index);
                 return 0;
         }
 
-        *pI = p_cache->p_info[*pw_control_index];
+        *pI = p_cache->p_info[control_index];
         if (!*pI) {
-                HPI_DEBUG_LOG(VERBOSE, "uncached adap %d, control %d\n",
-                        phm->adapter_index, *pw_control_index);
+                HPI_DEBUG_LOG(VERBOSE, "Uncached Control %d\n",
+                        control_index);
                 return 0;
         } else {
                 HPI_DEBUG_LOG(VERBOSE, "find_control() type %d\n",
@@ -247,25 +288,6 @@ static short find_control(struct hpi_message *phm,
         return 1;
 }
 
-/** Used by the kernel driver to figure out if a buffer needs mapping.
- */
-short hpi_check_buffer_mapping(struct hpi_control_cache *p_cache,
-        struct hpi_message *phm, void **p, unsigned int *pN)
-{
-        *pN = 0;
-        *p = NULL;
-        if ((phm->function == HPI_CONTROL_GET_STATE)
-                && (phm->object == HPI_OBJ_CONTROLEX)
-                ) {
-                u16 control_index;
-                struct hpi_control_cache_info *pI;
-
-                if (!find_control(phm, p_cache, &pI, &control_index))
-                        return 0;
-        }
-        return 0;
-}
-
 /* allow unified treatment of several string fields within struct */
 #define HPICMN_PAD_OFS_AND_SIZE(m)  {\
         offsetof(struct hpi_control_cache_pad, m), \
@@ -290,13 +312,16 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
         struct hpi_message *phm, struct hpi_response *phr)
 {
         short found = 1;
-        u16 control_index;
         struct hpi_control_cache_info *pI;
         struct hpi_control_cache_single *pC;
         struct hpi_control_cache_pad *p_pad;
 
-        if (!find_control(phm, p_cache, &pI, &control_index))
+        if (!find_control(phm->obj_index, p_cache, &pI)) {
+                HPI_DEBUG_LOG(VERBOSE,
+                        "HPICMN find_control() failed for adap %d\n",
+                        phm->adapter_index);
                 return 0;
+        }
 
         phr->error = 0;
 
@@ -310,55 +335,79 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
 
         case HPI_CONTROL_METER:
                 if (phm->u.c.attribute == HPI_METER_PEAK) {
-                        phr->u.c.an_log_value[0] = pC->u.p.an_log_peak[0];
-                        phr->u.c.an_log_value[1] = pC->u.p.an_log_peak[1];
+                        phr->u.c.an_log_value[0] = pC->u.meter.an_log_peak[0];
+                        phr->u.c.an_log_value[1] = pC->u.meter.an_log_peak[1];
                 } else if (phm->u.c.attribute == HPI_METER_RMS) {
-                        phr->u.c.an_log_value[0] = pC->u.p.an_logRMS[0];
-                        phr->u.c.an_log_value[1] = pC->u.p.an_logRMS[1];
+                        if (pC->u.meter.an_logRMS[0] ==
+                                HPI_CACHE_INVALID_SHORT) {
+                                phr->error =
+                                        HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                phr->u.c.an_log_value[0] = HPI_METER_MINIMUM;
+                                phr->u.c.an_log_value[1] = HPI_METER_MINIMUM;
+                        } else {
+                                phr->u.c.an_log_value[0] =
+                                        pC->u.meter.an_logRMS[0];
+                                phr->u.c.an_log_value[1] =
+                                        pC->u.meter.an_logRMS[1];
+                        }
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_VOLUME:
                 if (phm->u.c.attribute == HPI_VOLUME_GAIN) {
-                        phr->u.c.an_log_value[0] = pC->u.v.an_log[0];
-                        phr->u.c.an_log_value[1] = pC->u.v.an_log[1];
-                } else
+                        phr->u.c.an_log_value[0] = pC->u.vol.an_log[0];
+                        phr->u.c.an_log_value[1] = pC->u.vol.an_log[1];
+                } else if (phm->u.c.attribute == HPI_VOLUME_MUTE) {
+                        if (pC->u.vol.flags & HPI_VOLUME_FLAG_HAS_MUTE) {
+                                if (pC->u.vol.flags & HPI_VOLUME_FLAG_MUTED)
+                                        phr->u.c.param1 =
+                                                HPI_BITMASK_ALL_CHANNELS;
+                                else
+                                        phr->u.c.param1 = 0;
+                        } else {
+                                phr->error =
+                                        HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                phr->u.c.param1 = 0;
+                        }
+                } else {
                         found = 0;
+                }
                 break;
         case HPI_CONTROL_MULTIPLEXER:
                 if (phm->u.c.attribute == HPI_MULTIPLEXER_SOURCE) {
-                        phr->u.c.param1 = pC->u.x.source_node_type;
-                        phr->u.c.param2 = pC->u.x.source_node_index;
+                        phr->u.c.param1 = pC->u.mux.source_node_type;
+                        phr->u.c.param2 = pC->u.mux.source_node_index;
                 } else {
                         found = 0;
                 }
                 break;
         case HPI_CONTROL_CHANNEL_MODE:
                 if (phm->u.c.attribute == HPI_CHANNEL_MODE_MODE)
-                        phr->u.c.param1 = pC->u.m.mode;
+                        phr->u.c.param1 = pC->u.mode.mode;
                 else
                         found = 0;
                 break;
         case HPI_CONTROL_LEVEL:
                 if (phm->u.c.attribute == HPI_LEVEL_GAIN) {
-                        phr->u.c.an_log_value[0] = pC->u.l.an_log[0];
-                        phr->u.c.an_log_value[1] = pC->u.l.an_log[1];
+                        phr->u.c.an_log_value[0] = pC->u.level.an_log[0];
+                        phr->u.c.an_log_value[1] = pC->u.level.an_log[1];
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_TUNER:
                 if (phm->u.c.attribute == HPI_TUNER_FREQ)
-                        phr->u.c.param1 = pC->u.t.freq_ink_hz;
+                        phr->u.c.param1 = pC->u.tuner.freq_ink_hz;
                 else if (phm->u.c.attribute == HPI_TUNER_BAND)
-                        phr->u.c.param1 = pC->u.t.band;
-                else if ((phm->u.c.attribute == HPI_TUNER_LEVEL)
-                        && (phm->u.c.param1 == HPI_TUNER_LEVEL_AVERAGE))
-                        if (pC->u.t.level == HPI_ERROR_ILLEGAL_CACHE_VALUE) {
-                                phr->u.c.param1 = 0;
+                        phr->u.c.param1 = pC->u.tuner.band;
+                else if (phm->u.c.attribute == HPI_TUNER_LEVEL_AVG)
+                        if (pC->u.tuner.s_level_avg ==
+                                HPI_CACHE_INVALID_SHORT) {
+                                phr->u.cu.tuner.s_level = 0;
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
                         } else
-                                phr->u.c.param1 = pC->u.t.level;
+                                phr->u.cu.tuner.s_level =
+                                        pC->u.tuner.s_level_avg;
                 else
                         found = 0;
                 break;
@@ -366,7 +415,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 if (phm->u.c.attribute == HPI_AESEBURX_ERRORSTATUS)
                         phr->u.c.param1 = pC->u.aes3rx.error_status;
                 else if (phm->u.c.attribute == HPI_AESEBURX_FORMAT)
-                        phr->u.c.param1 = pC->u.aes3rx.source;
+                        phr->u.c.param1 = pC->u.aes3rx.format;
                 else
                         found = 0;
                 break;
@@ -385,13 +434,12 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
         case HPI_CONTROL_SILENCEDETECTOR:
                 if (phm->u.c.attribute == HPI_SILENCEDETECTOR_STATE) {
                         phr->u.c.param1 = pC->u.silence.state;
-                        phr->u.c.param2 = pC->u.silence.count;
                 } else
                         found = 0;
                 break;
         case HPI_CONTROL_MICROPHONE:
                 if (phm->u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)
-                        phr->u.c.param1 = pC->u.phantom_power.state;
+                        phr->u.c.param1 = pC->u.microphone.phantom_state;
                 else
                         found = 0;
                 break;
@@ -400,7 +448,7 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                         phr->u.c.param1 = pC->u.clk.source;
                 else if (phm->u.c.attribute == HPI_SAMPLECLOCK_SOURCE_INDEX) {
                         if (pC->u.clk.source_index ==
-                                HPI_ERROR_ILLEGAL_CACHE_VALUE) {
+                                HPI_CACHE_INVALID_UINT16) {
                                 phr->u.c.param1 = 0;
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
@@ -411,60 +459,63 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 else
                         found = 0;
                 break;
-        case HPI_CONTROL_PAD:
+        case HPI_CONTROL_PAD:{
+                        struct hpi_control_cache_pad *p_pad;
+                        p_pad = (struct hpi_control_cache_pad *)pI;
 
-                if (!(p_pad->field_valid_flags & (1 <<
-                                        HPI_CTL_ATTR_INDEX(phm->u.c.
-                                                attribute)))) {
-                        phr->error = HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
-                        break;
-                }
-
-                if (phm->u.c.attribute == HPI_PAD_PROGRAM_ID)
-                        phr->u.c.param1 = p_pad->pI;
-                else if (phm->u.c.attribute == HPI_PAD_PROGRAM_TYPE)
-                        phr->u.c.param1 = p_pad->pTY;
-                else {
-                        unsigned int index =
-                                HPI_CTL_ATTR_INDEX(phm->u.c.attribute) - 1;
-                        unsigned int offset = phm->u.c.param1;
-                        unsigned int pad_string_len, field_size;
-                        char *pad_string;
-                        unsigned int tocopy;
-
-                        HPI_DEBUG_LOG(VERBOSE, "PADS HPI_PADS_ %d\n",
-                                phm->u.c.attribute);
-
-                        if (index > ARRAY_SIZE(pad_desc) - 1) {
+                        if (!(p_pad->field_valid_flags & (1 <<
+                                                HPI_CTL_ATTR_INDEX(phm->u.c.
+                                                        attribute)))) {
                                 phr->error =
                                         HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
                                 break;
                         }
 
-                        pad_string = ((char *)p_pad) + pad_desc[index].offset;
-                        field_size = pad_desc[index].field_size;
-                        /* Ensure null terminator */
-                        pad_string[field_size - 1] = 0;
-
-                        pad_string_len = strlen(pad_string) + 1;
-
-                        if (offset > pad_string_len) {
-                                phr->error = HPI_ERROR_INVALID_CONTROL_VALUE;
-                                break;
+                        if (phm->u.c.attribute == HPI_PAD_PROGRAM_ID)
+                                phr->u.c.param1 = p_pad->pI;
+                        else if (phm->u.c.attribute == HPI_PAD_PROGRAM_TYPE)
+                                phr->u.c.param1 = p_pad->pTY;
+                        else {
+                                unsigned int index =
+                                        HPI_CTL_ATTR_INDEX(phm->u.c.
+                                        attribute) - 1;
+                                unsigned int offset = phm->u.c.param1;
+                                unsigned int pad_string_len, field_size;
+                                char *pad_string;
+                                unsigned int tocopy;
+
+                                if (index > ARRAY_SIZE(pad_desc) - 1) {
+                                        phr->error =
+                                                HPI_ERROR_INVALID_CONTROL_ATTRIBUTE;
+                                        break;
+                                }
+
+                                pad_string =
+                                        ((char *)p_pad) +
+                                        pad_desc[index].offset;
+                                field_size = pad_desc[index].field_size;
+                                /* Ensure null terminator */
+                                pad_string[field_size - 1] = 0;
+
+                                pad_string_len = strlen(pad_string) + 1;
+
+                                if (offset > pad_string_len) {
+                                        phr->error =
+                                                HPI_ERROR_INVALID_CONTROL_VALUE;
+                                        break;
+                                }
+
+                                tocopy = pad_string_len - offset;
+                                if (tocopy > sizeof(phr->u.cu.chars8.sz_data))
+                                        tocopy = sizeof(phr->u.cu.chars8.
+                                                sz_data);
+
+                                memcpy(phr->u.cu.chars8.sz_data,
+                                        &pad_string[offset], tocopy);
+
+                                phr->u.cu.chars8.remaining_chars =
+                                        pad_string_len - offset - tocopy;
                         }
-
-                        tocopy = pad_string_len - offset;
-                        if (tocopy > sizeof(phr->u.cu.chars8.sz_data))
-                                tocopy = sizeof(phr->u.cu.chars8.sz_data);
-
-                        HPI_DEBUG_LOG(VERBOSE,
-                                "PADS memcpy(%d), offset %d \n", tocopy,
-                                offset);
-                        memcpy(phr->u.cu.chars8.sz_data, &pad_string[offset],
-                                tocopy);
-
-                        phr->u.cu.chars8.remaining_chars =
-                                pad_string_len - offset - tocopy;
                 }
                 break;
         default:
@@ -472,16 +523,9 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
                 break;
         }
 
-        if (found)
-                HPI_DEBUG_LOG(VERBOSE,
-                        "cached adap %d, ctl %d, type %d, attr %d\n",
-                        phm->adapter_index, pI->control_index,
-                        pI->control_type, phm->u.c.attribute);
-        else
-                HPI_DEBUG_LOG(VERBOSE,
-                        "uncached adap %d, ctl %d, ctl type %d\n",
-                        phm->adapter_index, pI->control_index,
-                        pI->control_type);
+        HPI_DEBUG_LOG(VERBOSE, "%s Adap %d, Ctl %d, Type %d, Attr %d\n",
+                found ? "Cached" : "Uncached", phm->adapter_index,
+                pI->control_index, pI->control_type, phm->u.c.attribute);
 
         if (found)
                 phr->size =
@@ -497,18 +541,21 @@ Only update if no error.
 Volume and Level return the limited values in the response, so use these
 Multiplexer does so use sent values
 */
-void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
+void hpi_cmn_control_cache_sync_to_msg(struct hpi_control_cache *p_cache,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        u16 control_index;
         struct hpi_control_cache_single *pC;
         struct hpi_control_cache_info *pI;
 
         if (phr->error)
                 return;
 
-        if (!find_control(phm, p_cache, &pI, &control_index))
+        if (!find_control(phm->obj_index, p_cache, &pI)) {
+                HPI_DEBUG_LOG(VERBOSE,
+                        "HPICMN find_control() failed for adap %d\n",
+                        phm->adapter_index);
                 return;
+        }
 
         /* pC is the default cached control strucure.
            May be cast to something else in the following switch statement.
@@ -518,31 +565,36 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
         switch (pI->control_type) {
         case HPI_CONTROL_VOLUME:
                 if (phm->u.c.attribute == HPI_VOLUME_GAIN) {
-                        pC->u.v.an_log[0] = phr->u.c.an_log_value[0];
-                        pC->u.v.an_log[1] = phr->u.c.an_log_value[1];
+                        pC->u.vol.an_log[0] = phr->u.c.an_log_value[0];
+                        pC->u.vol.an_log[1] = phr->u.c.an_log_value[1];
+                } else if (phm->u.c.attribute == HPI_VOLUME_MUTE) {
+                        if (phm->u.c.param1)
+                                pC->u.vol.flags |= HPI_VOLUME_FLAG_MUTED;
+                        else
+                                pC->u.vol.flags &= ~HPI_VOLUME_FLAG_MUTED;
                 }
                 break;
         case HPI_CONTROL_MULTIPLEXER:
                 /* mux does not return its setting on Set command. */
                 if (phm->u.c.attribute == HPI_MULTIPLEXER_SOURCE) {
-                        pC->u.x.source_node_type = (u16)phm->u.c.param1;
-                        pC->u.x.source_node_index = (u16)phm->u.c.param2;
+                        pC->u.mux.source_node_type = (u16)phm->u.c.param1;
+                        pC->u.mux.source_node_index = (u16)phm->u.c.param2;
                 }
                 break;
         case HPI_CONTROL_CHANNEL_MODE:
                 /* mode does not return its setting on Set command. */
                 if (phm->u.c.attribute == HPI_CHANNEL_MODE_MODE)
-                        pC->u.m.mode = (u16)phm->u.c.param1;
+                        pC->u.mode.mode = (u16)phm->u.c.param1;
                 break;
         case HPI_CONTROL_LEVEL:
                 if (phm->u.c.attribute == HPI_LEVEL_GAIN) {
-                        pC->u.v.an_log[0] = phr->u.c.an_log_value[0];
-                        pC->u.v.an_log[1] = phr->u.c.an_log_value[1];
+                        pC->u.vol.an_log[0] = phr->u.c.an_log_value[0];
+                        pC->u.vol.an_log[1] = phr->u.c.an_log_value[1];
                 }
                 break;
         case HPI_CONTROL_MICROPHONE:
                 if (phm->u.c.attribute == HPI_MICROPHONE_PHANTOM_POWER)
-                        pC->u.phantom_power.state = (u16)phm->u.c.param1;
+                        pC->u.microphone.phantom_state = (u16)phm->u.c.param1;
                 break;
         case HPI_CONTROL_AESEBU_TRANSMITTER:
                 if (phm->u.c.attribute == HPI_AESEBUTX_FORMAT)
@@ -550,7 +602,7 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
                 break;
         case HPI_CONTROL_AESEBU_RECEIVER:
                 if (phm->u.c.attribute == HPI_AESEBURX_FORMAT)
-                        pC->u.aes3rx.source = phm->u.c.param1;
+                        pC->u.aes3rx.format = phm->u.c.param1;
                 break;
         case HPI_CONTROL_SAMPLECLOCK:
                 if (phm->u.c.attribute == HPI_SAMPLECLOCK_SOURCE)
@@ -565,59 +617,57 @@ void hpi_sync_control_cache(struct hpi_control_cache *p_cache,
         }
 }
 
-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)
+struct hpi_control_cache *hpi_alloc_control_cache(const u32 control_count,
+        const u32 size_in_bytes, u8 *p_dsp_control_buffer)
 {
         struct hpi_control_cache *p_cache =
                 kmalloc(sizeof(*p_cache), GFP_KERNEL);
         if (!p_cache)
                 return NULL;
+
         p_cache->p_info =
-                kmalloc(sizeof(*p_cache->p_info) * number_of_controls,
-                        GFP_KERNEL);
+                kmalloc(sizeof(*p_cache->p_info) * control_count, GFP_KERNEL);
         if (!p_cache->p_info) {
                 kfree(p_cache);
                 return NULL;
         }
+        memset(p_cache->p_info, 0, sizeof(*p_cache->p_info) * control_count);
         p_cache->cache_size_in_bytes = size_in_bytes;
-        p_cache->control_count = number_of_controls;
-        p_cache->p_cache =
-                (struct hpi_control_cache_single *)pDSP_control_buffer;
+        p_cache->control_count = control_count;
+        p_cache->p_cache = p_dsp_control_buffer;
         p_cache->init = 0;
         return p_cache;
 }
 
 void hpi_free_control_cache(struct hpi_control_cache *p_cache)
 {
-        if (p_cache->init) {
+        if (p_cache) {
                 kfree(p_cache->p_info);
-                p_cache->p_info = NULL;
-                p_cache->init = 0;
                 kfree(p_cache);
         }
 }
 
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 {
+        hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm->function, 0);
 
         switch (phm->function) {
         case HPI_SUBSYS_OPEN:
         case HPI_SUBSYS_CLOSE:
         case HPI_SUBSYS_DRIVER_UNLOAD:
-                phr->error = 0;
                 break;
         case HPI_SUBSYS_DRIVER_LOAD:
                 wipe_adapter_list();
                 hpios_alistlock_init(&adapters);
-                phr->error = 0;
                 break;
-        case HPI_SUBSYS_GET_INFO:
-                subsys_get_adapters(phr);
+        case HPI_SUBSYS_GET_ADAPTER:
+                subsys_get_adapter(phm, phr);
+                break;
+        case HPI_SUBSYS_GET_NUM_ADAPTERS:
+                phr->u.s.num_adapters = adapters.gw_num_adapters;
                 break;
         case HPI_SUBSYS_CREATE_ADAPTER:
         case HPI_SUBSYS_DELETE_ADAPTER:
-                phr->error = 0;
                 break;
         default:
                 phr->error = HPI_ERROR_INVALID_FUNC;
diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
index 6229022f56cb..590f0b69e655 100644
--- a/sound/pci/asihpi/hpicmn.h
+++ b/sound/pci/asihpi/hpicmn.h
@@ -33,18 +33,19 @@ struct hpi_adapter_obj {
 };
 
 struct hpi_control_cache {
-        u32 init;            /**< indicates whether the
-                                structures are initialized */
+        /** indicates whether the structures are initialized */
+        u16 init;
+        u16 adap_idx;
         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. */
+        /** pointer to allocated memory of lookup pointers. */
+        struct hpi_control_cache_info **p_info;
+        /** pointer to DSP's control cache. */
+        u8 *p_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);
@@ -52,13 +53,10 @@ 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);
+        number_of_controls, const u32 size_in_bytes, u8 *pDSP_control_buffer);
 void hpi_free_control_cache(struct hpi_control_cache *p_cache);
 
-void hpi_sync_control_cache(struct hpi_control_cache *pC,
+void hpi_cmn_control_cache_sync_to_msg(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);
diff --git a/sound/pci/asihpi/hpidebug.c b/sound/pci/asihpi/hpidebug.c
index 949836ec913a..b52baf62791e 100644
--- a/sound/pci/asihpi/hpidebug.c
+++ b/sound/pci/asihpi/hpidebug.c
@@ -45,161 +45,14 @@ int hpi_debug_level_get(void)
         return hpi_debug_level;
 }
 
-#ifdef HPIOS_DEBUG_PRINT
-/* implies OS has no printf-like function */
-#include <stdarg.h>
-
-void hpi_debug_printf(char *fmt, ...)
-{
-        va_list arglist;
-        char buffer[128];
-
-        va_start(arglist, fmt);
-
-        if (buffer[0])
-                HPIOS_DEBUG_PRINT(buffer);
-        va_end(arglist);
-}
-#endif
-
-struct treenode {
-        void *array;
-        unsigned int num_elements;
-};
-
-#define make_treenode_from_array(nodename, array) \
-static void *tmp_strarray_##nodename[] = array; \
-static struct treenode nodename = { \
-        &tmp_strarray_##nodename, \
-        ARRAY_SIZE(tmp_strarray_##nodename) \
-};
-
-#define get_treenode_elem(node_ptr, idx, type)  \
-        (&(*((type *)(node_ptr)->array)[idx]))
-
-make_treenode_from_array(hpi_control_type_strings, HPI_CONTROL_TYPE_STRINGS)
-
-        make_treenode_from_array(hpi_subsys_strings, HPI_SUBSYS_STRINGS)
-        make_treenode_from_array(hpi_adapter_strings, HPI_ADAPTER_STRINGS)
-        make_treenode_from_array(hpi_istream_strings, HPI_ISTREAM_STRINGS)
-        make_treenode_from_array(hpi_ostream_strings, HPI_OSTREAM_STRINGS)
-        make_treenode_from_array(hpi_mixer_strings, HPI_MIXER_STRINGS)
-        make_treenode_from_array(hpi_node_strings,
-        {
-        "NODE is invalid object"})
-
-        make_treenode_from_array(hpi_control_strings, HPI_CONTROL_STRINGS)
-        make_treenode_from_array(hpi_nvmemory_strings, HPI_OBJ_STRINGS)
-        make_treenode_from_array(hpi_digitalio_strings, HPI_DIGITALIO_STRINGS)
-        make_treenode_from_array(hpi_watchdog_strings, HPI_WATCHDOG_STRINGS)
-        make_treenode_from_array(hpi_clock_strings, HPI_CLOCK_STRINGS)
-        make_treenode_from_array(hpi_profile_strings, HPI_PROFILE_STRINGS)
-        make_treenode_from_array(hpi_asyncevent_strings, HPI_ASYNCEVENT_STRINGS)
-#define HPI_FUNCTION_STRINGS \
-{ \
-  &hpi_subsys_strings,\
-  &hpi_adapter_strings,\
-  &hpi_ostream_strings,\
-  &hpi_istream_strings,\
-  &hpi_mixer_strings,\
-  &hpi_node_strings,\
-  &hpi_control_strings,\
-  &hpi_nvmemory_strings,\
-  &hpi_digitalio_strings,\
-  &hpi_watchdog_strings,\
-  &hpi_clock_strings,\
-  &hpi_profile_strings,\
-  &hpi_control_strings, \
-  &hpi_asyncevent_strings \
-}
-        make_treenode_from_array(hpi_function_strings, HPI_FUNCTION_STRINGS)
-
-        compile_time_assert(HPI_OBJ_MAXINDEX == 14, obj_list_doesnt_match);
-
-static char *hpi_function_string(unsigned int function)
-{
-        unsigned int object;
-        struct treenode *tmp;
-
-        object = function / HPI_OBJ_FUNCTION_SPACING;
-        function = function - object * HPI_OBJ_FUNCTION_SPACING;
-
-        if (object == 0 || object == HPI_OBJ_NODE
-                || object > hpi_function_strings.num_elements)
-                return "invalid object";
-
-        tmp = get_treenode_elem(&hpi_function_strings, object - 1,
-                struct treenode *);
-
-        if (function == 0 || function > tmp->num_elements)
-                return "invalid function";
-
-        return get_treenode_elem(tmp, function - 1, char *);
-}
-
 void hpi_debug_message(struct hpi_message *phm, char *sz_fileline)
 {
         if (phm) {
-                if ((phm->object <= HPI_OBJ_MAXINDEX) && phm->object) {
-                        u16 index = 0;
-                        u16 attrib = 0;
-                        int is_control = 0;
-
-                        index = phm->obj_index;
-                        switch (phm->object) {
-                        case HPI_OBJ_ADAPTER:
-                        case HPI_OBJ_PROFILE:
-                                break;
-                        case HPI_OBJ_MIXER:
-                                if (phm->function ==
-                                        HPI_MIXER_GET_CONTROL_BY_INDEX)
-                                        index = phm->u.m.control_index;
-                                break;
-                        case HPI_OBJ_OSTREAM:
-                        case HPI_OBJ_ISTREAM:
-                                break;
-
-                        case HPI_OBJ_CONTROLEX:
-                        case HPI_OBJ_CONTROL:
-                                if (phm->version == 1)
-                                        attrib = HPI_CTL_ATTR(UNIVERSAL, 1);
-                                else
-                                        attrib = phm->u.c.attribute;
-                                is_control = 1;
-                                break;
-                        default:
-                                break;
-                        }
-
-                        if (is_control && (attrib & 0xFF00)) {
-                                int control_type = (attrib & 0xFF00) >> 8;
-                                int attr_index = HPI_CTL_ATTR_INDEX(attrib);
-                                /* note the KERN facility level
-                                   is in szFileline already */
-                                printk("%s adapter %d %s "
-                                        "ctrl_index x%04x %s %d\n",
-                                        sz_fileline, phm->adapter_index,
-                                        hpi_function_string(phm->function),
-                                        index,
-                                        get_treenode_elem
-                                        (&hpi_control_type_strings,
-                                                control_type, char *),
-                                        attr_index);
-
-                        } else
-                                printk("%s adapter %d %s "
-                                        "idx x%04x attr x%04x \n",
-                                        sz_fileline, phm->adapter_index,
-                                        hpi_function_string(phm->function),
-                                        index, attrib);
-                } else {
-                        printk("adap=%d, invalid obj=%d, func=0x%x\n",
-                                phm->adapter_index, phm->object,
-                                phm->function);
-                }
-        } else
-                printk(KERN_ERR
-                        "NULL message pointer to hpi_debug_message!\n");
+                printk(KERN_DEBUG "HPI_MSG%d,%d,%d,%d,%d\n", phm->version,
+                        phm->adapter_index, phm->obj_index, phm->function,
+                        phm->u.c.attribute);
+        }
+
 }
 
 void hpi_debug_data(u16 *pdata, u32 len)
diff --git a/sound/pci/asihpi/hpidebug.h b/sound/pci/asihpi/hpidebug.h
index a2f0952a99f0..940f54c3c538 100644
--- a/sound/pci/asihpi/hpidebug.h
+++ b/sound/pci/asihpi/hpidebug.h
@@ -37,7 +37,7 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */
 #define HPI_DEBUG_LEVEL_DEFAULT HPI_DEBUG_LEVEL_NOTICE
 
 /* an OS can define an extra flag string that is appended to
-   the start of each message, eg see hpios_linux.h */
+   the start of each message, eg see linux kernel hpios.h */
 
 #ifdef SOURCEFILE_NAME
 #define FILE_LINE  SOURCEFILE_NAME ":" __stringify(__LINE__) " "
@@ -45,18 +45,11 @@ enum { HPI_DEBUG_LEVEL_ERROR = 0,	/* always log errors */
 #define FILE_LINE  __FILE__ ":" __stringify(__LINE__) " "
 #endif
 
-#if defined(HPI_DEBUG) && defined(_WINDOWS)
-#define HPI_DEBUGBREAK() debug_break()
-#else
-#define HPI_DEBUGBREAK()
-#endif
-
 #define HPI_DEBUG_ASSERT(expression) \
         do { \
-                if (!(expression)) {\
-                        printk(KERN_ERR  FILE_LINE\
-                                "ASSERT " __stringify(expression));\
-                        HPI_DEBUGBREAK();\
+                if (!(expression)) { \
+                        printk(KERN_ERR  FILE_LINE \
+                                "ASSERT " __stringify(expression)); \
                 } \
         } while (0)
 
@@ -78,28 +71,27 @@ void hpi_debug_message(struct hpi_message *phm, char *sz_fileline);
 
 void hpi_debug_data(u16 *pdata, u32 len);
 
-#define HPI_DEBUG_DATA(pdata, len)                                      \
-        do {                                                            \
+#define HPI_DEBUG_DATA(pdata, len) \
+        do { \
                 if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE) \
                         hpi_debug_data(pdata, len); \
         } while (0)
 
-#define HPI_DEBUG_MESSAGE(level, phm)                                   \
-        do {                                                            \
-                if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) {         \
-                        hpi_debug_message(phm,HPI_DEBUG_FLAG_##level    \
-                                FILE_LINE __stringify(level));\
-                }                                                       \
+#define HPI_DEBUG_MESSAGE(level, phm) \
+        do { \
+                if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) { \
+                        hpi_debug_message(phm, HPI_DEBUG_FLAG_##level \
+                                FILE_LINE __stringify(level)); \
+                } \
         } while (0)
 
-#define HPI_DEBUG_RESPONSE(phr)                                         \
-        do {                                                            \
-                if ((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && (phr->error))\
-                        HPI_DEBUG_LOG(ERROR, \
-                                "HPI response - error# %d\n", \
-                                phr->error); \
-                else if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE) \
-                        HPI_DEBUG_LOG(VERBOSE, "HPI response OK\n");\
+#define HPI_DEBUG_RESPONSE(phr) \
+        do { \
+                if (((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && \
+                        (phr->error)) ||\
+                (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)) \
+                        printk(KERN_DEBUG "HPI_RES%d,%d,%d\n", \
+                                phr->version, phr->error, phr->specific_error); \
         } while (0)
 
 #ifndef compile_time_assert
@@ -107,279 +99,4 @@ void hpi_debug_data(u16 *pdata, u32 len);
     typedef char msg[(cond) ? 1 : -1]
 #endif
 
-          /* check that size is exactly some number */
-#define function_count_check(sym, size) \
-    compile_time_assert((sym##_FUNCTION_COUNT) == (size),\
-            strings_match_defs_##sym)
-
-/* These strings should be generated using a macro which defines
-   the corresponding symbol values.  */
-#define HPI_OBJ_STRINGS \
-{                               \
-  "HPI_OBJ_SUBSYSTEM",        \
-  "HPI_OBJ_ADAPTER",          \
-  "HPI_OBJ_OSTREAM",          \
-  "HPI_OBJ_ISTREAM",          \
-  "HPI_OBJ_MIXER",            \
-  "HPI_OBJ_NODE",             \
-  "HPI_OBJ_CONTROL",          \
-  "HPI_OBJ_NVMEMORY",         \
-  "HPI_OBJ_DIGITALIO",        \
-  "HPI_OBJ_WATCHDOG",         \
-  "HPI_OBJ_CLOCK",            \
-  "HPI_OBJ_PROFILE",          \
-  "HPI_OBJ_CONTROLEX"         \
-}
-
-#define HPI_SUBSYS_STRINGS      \
-{                               \
-  "HPI_SUBSYS_OPEN",          \
-  "HPI_SUBSYS_GET_VERSION",   \
-  "HPI_SUBSYS_GET_INFO",      \
-  "HPI_SUBSYS_FIND_ADAPTERS", \
-  "HPI_SUBSYS_CREATE_ADAPTER",\
-  "HPI_SUBSYS_CLOSE",         \
-  "HPI_SUBSYS_DELETE_ADAPTER", \
-  "HPI_SUBSYS_DRIVER_LOAD", \
-  "HPI_SUBSYS_DRIVER_UNLOAD", \
-  "HPI_SUBSYS_READ_PORT_8",   \
-  "HPI_SUBSYS_WRITE_PORT_8",  \
-  "HPI_SUBSYS_GET_NUM_ADAPTERS",\
-  "HPI_SUBSYS_GET_ADAPTER",   \
-  "HPI_SUBSYS_SET_NETWORK_INTERFACE"\
-}
-function_count_check(HPI_SUBSYS, 14);
-
-#define HPI_ADAPTER_STRINGS     \
-{                               \
-  "HPI_ADAPTER_OPEN",         \
-  "HPI_ADAPTER_CLOSE",        \
-  "HPI_ADAPTER_GET_INFO",     \
-  "HPI_ADAPTER_GET_ASSERT",   \
-  "HPI_ADAPTER_TEST_ASSERT",    \
-  "HPI_ADAPTER_SET_MODE",       \
-  "HPI_ADAPTER_GET_MODE",       \
-  "HPI_ADAPTER_ENABLE_CAPABILITY",\
-  "HPI_ADAPTER_SELFTEST",        \
-  "HPI_ADAPTER_FIND_OBJECT",     \
-  "HPI_ADAPTER_QUERY_FLASH",     \
-  "HPI_ADAPTER_START_FLASH",     \
-  "HPI_ADAPTER_PROGRAM_FLASH",   \
-  "HPI_ADAPTER_SET_PROPERTY",    \
-  "HPI_ADAPTER_GET_PROPERTY",    \
-  "HPI_ADAPTER_ENUM_PROPERTY",    \
-  "HPI_ADAPTER_MODULE_INFO",    \
-  "HPI_ADAPTER_DEBUG_READ"    \
-}
-
-function_count_check(HPI_ADAPTER, 18);
-
-#define HPI_OSTREAM_STRINGS     \
-{                               \
-  "HPI_OSTREAM_OPEN",         \
-  "HPI_OSTREAM_CLOSE",        \
-  "HPI_OSTREAM_WRITE",        \
-  "HPI_OSTREAM_START",        \
-  "HPI_OSTREAM_STOP",         \
-  "HPI_OSTREAM_RESET",                \
-  "HPI_OSTREAM_GET_INFO",     \
-  "HPI_OSTREAM_QUERY_FORMAT", \
-  "HPI_OSTREAM_DATA",         \
-  "HPI_OSTREAM_SET_VELOCITY", \
-  "HPI_OSTREAM_SET_PUNCHINOUT", \
-  "HPI_OSTREAM_SINEGEN",        \
-  "HPI_OSTREAM_ANC_RESET",      \
-  "HPI_OSTREAM_ANC_GET_INFO",   \
-  "HPI_OSTREAM_ANC_READ",       \
-  "HPI_OSTREAM_SET_TIMESCALE",\
-  "HPI_OSTREAM_SET_FORMAT", \
-  "HPI_OSTREAM_HOSTBUFFER_ALLOC", \
-  "HPI_OSTREAM_HOSTBUFFER_FREE", \
-  "HPI_OSTREAM_GROUP_ADD",\
-  "HPI_OSTREAM_GROUP_GETMAP", \
-  "HPI_OSTREAM_GROUP_RESET", \
-  "HPI_OSTREAM_HOSTBUFFER_GET_INFO", \
-  "HPI_OSTREAM_WAIT_START", \
-}
-function_count_check(HPI_OSTREAM, 24);
-
-#define HPI_ISTREAM_STRINGS     \
-{                               \
-  "HPI_ISTREAM_OPEN",         \
-  "HPI_ISTREAM_CLOSE",        \
-  "HPI_ISTREAM_SET_FORMAT",   \
-  "HPI_ISTREAM_READ",         \
-  "HPI_ISTREAM_START",        \
-  "HPI_ISTREAM_STOP",         \
-  "HPI_ISTREAM_RESET",        \
-  "HPI_ISTREAM_GET_INFO",     \
-  "HPI_ISTREAM_QUERY_FORMAT", \
-  "HPI_ISTREAM_ANC_RESET",      \
-  "HPI_ISTREAM_ANC_GET_INFO",   \
-  "HPI_ISTREAM_ANC_WRITE",   \
-  "HPI_ISTREAM_HOSTBUFFER_ALLOC",\
-  "HPI_ISTREAM_HOSTBUFFER_FREE", \
-  "HPI_ISTREAM_GROUP_ADD", \
-  "HPI_ISTREAM_GROUP_GETMAP", \
-  "HPI_ISTREAM_GROUP_RESET", \
-  "HPI_ISTREAM_HOSTBUFFER_GET_INFO", \
-  "HPI_ISTREAM_WAIT_START", \
-}
-function_count_check(HPI_ISTREAM, 19);
-
-#define HPI_MIXER_STRINGS       \
-{                               \
-  "HPI_MIXER_OPEN",           \
-  "HPI_MIXER_CLOSE",          \
-  "HPI_MIXER_GET_INFO",       \
-  "HPI_MIXER_GET_NODE_INFO",  \
-  "HPI_MIXER_GET_CONTROL",    \
-  "HPI_MIXER_SET_CONNECTION", \
-  "HPI_MIXER_GET_CONNECTIONS",        \
-  "HPI_MIXER_GET_CONTROL_BY_INDEX",   \
-  "HPI_MIXER_GET_CONTROL_ARRAY_BY_INDEX",     \
-  "HPI_MIXER_GET_CONTROL_MULTIPLE_VALUES",    \
-  "HPI_MIXER_STORE",  \
-}
-function_count_check(HPI_MIXER, 11);
-
-#define HPI_CONTROL_STRINGS     \
-{                               \
-  "HPI_CONTROL_GET_INFO",     \
-  "HPI_CONTROL_GET_STATE",    \
-  "HPI_CONTROL_SET_STATE"     \
-}
-function_count_check(HPI_CONTROL, 3);
-
-#define HPI_NVMEMORY_STRINGS    \
-{                               \
-  "HPI_NVMEMORY_OPEN",        \
-  "HPI_NVMEMORY_READ_BYTE",   \
-  "HPI_NVMEMORY_WRITE_BYTE"   \
-}
-function_count_check(HPI_NVMEMORY, 3);
-
-#define HPI_DIGITALIO_STRINGS   \
-{                               \
-  "HPI_GPIO_OPEN",            \
-  "HPI_GPIO_READ_BIT",        \
-  "HPI_GPIO_WRITE_BIT",       \
-  "HPI_GPIO_READ_ALL",                \
-  "HPI_GPIO_WRITE_STATUS"\
-}
-function_count_check(HPI_GPIO, 5);
-
-#define HPI_WATCHDOG_STRINGS    \
-{                               \
-  "HPI_WATCHDOG_OPEN",        \
-  "HPI_WATCHDOG_SET_TIME",    \
-  "HPI_WATCHDOG_PING"         \
-}
-
-#define HPI_CLOCK_STRINGS       \
-{                               \
-  "HPI_CLOCK_OPEN",           \
-  "HPI_CLOCK_SET_TIME",       \
-  "HPI_CLOCK_GET_TIME"        \
-}
-
-#define HPI_PROFILE_STRINGS     \
-{                               \
-  "HPI_PROFILE_OPEN_ALL",     \
-  "HPI_PROFILE_START_ALL",    \
-  "HPI_PROFILE_STOP_ALL",     \
-  "HPI_PROFILE_GET",          \
-  "HPI_PROFILE_GET_IDLECOUNT",  \
-  "HPI_PROFILE_GET_NAME",       \
-  "HPI_PROFILE_GET_UTILIZATION" \
-}
-function_count_check(HPI_PROFILE, 7);
-
-#define HPI_ASYNCEVENT_STRINGS  \
-{                               \
-  "HPI_ASYNCEVENT_OPEN",\
-  "HPI_ASYNCEVENT_CLOSE  ",\
-  "HPI_ASYNCEVENT_WAIT",\
-  "HPI_ASYNCEVENT_GETCOUNT",\
-  "HPI_ASYNCEVENT_GET",\
-  "HPI_ASYNCEVENT_SENDEVENTS"\
-}
-function_count_check(HPI_ASYNCEVENT, 6);
-
-#define HPI_CONTROL_TYPE_STRINGS \
-{ \
-        "null control", \
-        "HPI_CONTROL_CONNECTION", \
-        "HPI_CONTROL_VOLUME", \
-        "HPI_CONTROL_METER", \
-        "HPI_CONTROL_MUTE", \
-        "HPI_CONTROL_MULTIPLEXER", \
-        "HPI_CONTROL_AESEBU_TRANSMITTER", \
-        "HPI_CONTROL_AESEBU_RECEIVER", \
-        "HPI_CONTROL_LEVEL", \
-        "HPI_CONTROL_TUNER", \
-        "HPI_CONTROL_ONOFFSWITCH", \
-        "HPI_CONTROL_VOX", \
-        "HPI_CONTROL_AES18_TRANSMITTER", \
-        "HPI_CONTROL_AES18_RECEIVER", \
-        "HPI_CONTROL_AES18_BLOCKGENERATOR", \
-        "HPI_CONTROL_CHANNEL_MODE", \
-        "HPI_CONTROL_BITSTREAM", \
-        "HPI_CONTROL_SAMPLECLOCK", \
-        "HPI_CONTROL_MICROPHONE", \
-        "HPI_CONTROL_PARAMETRIC_EQ", \
-        "HPI_CONTROL_COMPANDER", \
-        "HPI_CONTROL_COBRANET", \
-        "HPI_CONTROL_TONE_DETECT", \
-        "HPI_CONTROL_SILENCE_DETECT", \
-        "HPI_CONTROL_PAD", \
-        "HPI_CONTROL_SRC" ,\
-        "HPI_CONTROL_UNIVERSAL" \
-}
-
-compile_time_assert((HPI_CONTROL_LAST_INDEX + 1 == 27),
-        controltype_strings_match_defs);
-
-#define HPI_SOURCENODE_STRINGS \
-{ \
-        "no source", \
-        "HPI_SOURCENODE_OSTREAM", \
-        "HPI_SOURCENODE_LINEIN", \
-        "HPI_SOURCENODE_AESEBU_IN", \
-        "HPI_SOURCENODE_TUNER", \
-        "HPI_SOURCENODE_RF", \
-        "HPI_SOURCENODE_CLOCK_SOURCE", \
-        "HPI_SOURCENODE_RAW_BITSTREAM", \
-        "HPI_SOURCENODE_MICROPHONE", \
-        "HPI_SOURCENODE_COBRANET", \
-        "HPI_SOURCENODE_ANALOG", \
-        "HPI_SOURCENODE_ADAPTER" \
-}
-
-compile_time_assert((HPI_SOURCENODE_LAST_INDEX - HPI_SOURCENODE_NONE + 1) ==
-        (12), sourcenode_strings_match_defs);
-
-#define HPI_DESTNODE_STRINGS \
-{ \
-        "no destination", \
-        "HPI_DESTNODE_ISTREAM", \
-        "HPI_DESTNODE_LINEOUT", \
-        "HPI_DESTNODE_AESEBU_OUT", \
-        "HPI_DESTNODE_RF", \
-        "HPI_DESTNODE_SPEAKER", \
-        "HPI_DESTNODE_COBRANET", \
-        "HPI_DESTNODE_ANALOG" \
-}
-compile_time_assert((HPI_DESTNODE_LAST_INDEX - HPI_DESTNODE_NONE + 1) == (8),
-        destnode_strings_match_defs);
-
-#define HPI_CONTROL_CHANNEL_MODE_STRINGS \
-{ \
-        "XXX HPI_CHANNEL_MODE_ERROR XXX", \
-        "HPI_CHANNEL_MODE_NORMAL", \
-        "HPI_CHANNEL_MODE_SWAP", \
-        "HPI_CHANNEL_MODE_LEFT_ONLY", \
-        "HPI_CHANNEL_MODE_RIGHT_ONLY" \
-}
-
-#endif                          /* _HPIDEBUG_H  */
+#endif                          /* _HPIDEBUG_H_  */
diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c
index 9b10d9a5c255..fb311d8c05bf 100644
--- a/sound/pci/asihpi/hpidspcd.c
+++ b/sound/pci/asihpi/hpidspcd.c
@@ -71,47 +71,50 @@ short hpi_dsp_code_open(u32 adapter, struct dsp_code *ps_dsp_code,
         int err;
 
         sprintf(fw_name, "asihpi/dsp%04x.bin", adapter);
-        HPI_DEBUG_LOG(INFO, "requesting firmware for %s\n", fw_name);
 
         err = request_firmware(&ps_firmware, fw_name,
                 &ps_dsp_code->ps_dev->dev);
+
         if (err != 0) {
-                HPI_DEBUG_LOG(ERROR, "%d, request_firmware failed for  %s\n",
-                        err, fw_name);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "%d, request_firmware failed for  %s\n", err,
+                        fw_name);
                 goto error1;
         }
         if (ps_firmware->size < sizeof(header)) {
-                HPI_DEBUG_LOG(ERROR, "header size too small %s\n", fw_name);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Header size too small %s\n", fw_name);
                 goto error2;
         }
         memcpy(&header, ps_firmware->data, sizeof(header));
         if (header.adapter != adapter) {
-                HPI_DEBUG_LOG(ERROR, "adapter type incorrect %4x != %4x\n",
-                        header.adapter, adapter);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Adapter type incorrect %4x != %4x\n", header.adapter,
+                        adapter);
                 goto error2;
         }
         if (header.size != ps_firmware->size) {
-                HPI_DEBUG_LOG(ERROR, "code size wrong  %d != %ld\n",
-                        header.size, (unsigned long)ps_firmware->size);
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Code size wrong  %d != %ld\n", header.size,
+                        (unsigned long)ps_firmware->size);
                 goto error2;
         }
 
-        if (header.version / 10000 != HPI_VER_DECIMAL / 10000) {
-                HPI_DEBUG_LOG(ERROR,
-                        "firmware major version mismatch "
-                        "DSP image %d != driver %d\n", header.version,
+        if (header.version / 100 != HPI_VER_DECIMAL / 100) {
+                dev_printk(KERN_ERR, &ps_dsp_code->ps_dev->dev,
+                        "Incompatible firmware version "
+                        "DSP image %d != Driver %d\n", header.version,
                         HPI_VER_DECIMAL);
                 goto error2;
         }
 
         if (header.version != HPI_VER_DECIMAL) {
-                HPI_DEBUG_LOG(WARNING,
-                        "version mismatch  DSP image %d != driver %d\n",
+                dev_printk(KERN_WARNING, &ps_dsp_code->ps_dev->dev,
+                        "Firmware: release version mismatch  DSP image %d != Driver %d\n",
                         header.version, HPI_VER_DECIMAL);
-                /* goto error2;  still allow driver to load */
         }
 
-        HPI_DEBUG_LOG(INFO, "dsp code %s opened\n", fw_name);
+        HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name);
         ps_dsp_code->ps_firmware = ps_firmware;
         ps_dsp_code->block_length = header.size / sizeof(u32);
         ps_dsp_code->word_count = sizeof(header) / sizeof(u32);
@@ -148,7 +151,7 @@ void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code)
 short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code, u32 *pword)
 {
         if (ps_dsp_code->word_count + 1 > ps_dsp_code->block_length)
-                return (HPI_ERROR_DSP_FILE_FORMAT);
+                return HPI_ERROR_DSP_FILE_FORMAT;
 
         *pword = ((u32 *)(ps_dsp_code->ps_firmware->data))[ps_dsp_code->
                 word_count];
diff --git a/sound/pci/asihpi/hpidspcd.h b/sound/pci/asihpi/hpidspcd.h
index d7c240398225..65f0ca732704 100644
--- a/sound/pci/asihpi/hpidspcd.h
+++ b/sound/pci/asihpi/hpidspcd.h
@@ -87,7 +87,7 @@ void hpi_dsp_code_rewind(struct dsp_code *ps_dsp_code);
 */
 short hpi_dsp_code_read_word(struct dsp_code *ps_dsp_code,
                                       /**< DSP code descriptor */
-        u32 *pword /**< where to store the read word */
+        u32 *pword /**< Where to store the read word */
         );
 
 /** Get a block of dsp code into an internal buffer, and provide a pointer to
diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c
index 1e92eb6dd509..c38fc9487560 100644
--- a/sound/pci/asihpi/hpifunc.c
+++ b/sound/pci/asihpi/hpifunc.c
@@ -30,16 +30,25 @@ u32 hpi_indexes_to_handle(const char c_object, const u16 adapter_index,
         return handle.w;
 }
 
-void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,
-        u16 *pw_object_index)
+static u16 hpi_handle_indexes(const u32 h, u16 *p1, u16 *p2)
 {
         union handle_word uhandle;
-        uhandle.w = handle;
+        if (!h)
+                return HPI_ERROR_INVALID_HANDLE;
+
+        uhandle.w = h;
+
+        *p1 = (u16)uhandle.h.adapter_index;
+        if (p2)
+                *p2 = (u16)uhandle.h.obj_index;
 
-        if (pw_adapter_index)
-                *pw_adapter_index = (u16)uhandle.h.adapter_index;
-        if (pw_object_index)
-                *pw_object_index = (u16)uhandle.h.obj_index;
+        return 0;
+}
+
+void hpi_handle_to_indexes(const u32 handle, u16 *pw_adapter_index,
+        u16 *pw_object_index)
+{
+        hpi_handle_indexes(handle, pw_adapter_index, pw_object_index);
 }
 
 char hpi_handle_object(const u32 handle)
@@ -49,22 +58,6 @@ char hpi_handle_object(const u32 handle)
         return (char)uhandle.h.obj_type;
 }
 
-#define u32TOINDEX(h, i1) \
-do {\
-        if (h == 0) \
-                return HPI_ERROR_INVALID_OBJ; \
-        else \
-                hpi_handle_to_indexes(h, i1, NULL); \
-} while (0)
-
-#define u32TOINDEXES(h, i1, i2) \
-do {\
-        if (h == 0) \
-                return HPI_ERROR_INVALID_OBJ; \
-        else \
-                hpi_handle_to_indexes(h, i1, i2);\
-} while (0)
-
 void hpi_format_to_msg(struct hpi_msg_format *pMF,
         const struct hpi_format *pF)
 {
@@ -94,52 +87,13 @@ void hpi_stream_response_to_legacy(struct hpi_stream_res *pSR)
         pSR->u.legacy_stream_info.state = pSR->u.stream_info.state;
 }
 
-static struct hpi_hsubsys gh_subsys;
-
-struct hpi_hsubsys *hpi_subsys_create(void)
+static inline void hpi_send_recvV1(struct hpi_message_header *m,
+        struct hpi_response_header *r)
 {
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        memset(&gh_subsys, 0, sizeof(struct hpi_hsubsys));
-
-        {
-                hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                        HPI_SUBSYS_OPEN);
-                hpi_send_recv(&hm, &hr);
-
-                if (hr.error == 0)
-                        return &gh_subsys;
-
-        }
-        return NULL;
-}
-
-void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_CLOSE);
-        hpi_send_recv(&hm, &hr);
-
+        hpi_send_recv((struct hpi_message *)m, (struct hpi_response *)r);
 }
 
-u16 hpi_subsys_get_version(const struct hpi_hsubsys *ph_subsys, u32 *pversion)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_GET_VERSION);
-        hpi_send_recv(&hm, &hr);
-        *pversion = hr.u.s.version;
-        return hr.error;
-}
-
-u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 *pversion_ex)
+u16 hpi_subsys_get_version_ex(u32 *pversion_ex)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -151,51 +105,8 @@ u16 hpi_subsys_get_version_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_subsys_get_info(const struct hpi_hsubsys *ph_subsys, u32 *pversion,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_GET_INFO);
-
-        hpi_send_recv(&hm, &hr);
-
-        *pversion = hr.u.s.version;
-        if (list_length > HPI_MAX_ADAPTERS)
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        HPI_MAX_ADAPTERS);
-        else
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list, list_length);
-        *pw_num_adapters = hr.u.s.num_adapters;
-        return hr.error;
-}
-
-u16 hpi_subsys_find_adapters(const struct hpi_hsubsys *ph_subsys,
-        u16 *pw_num_adapters, u16 aw_adapter_list[], u16 list_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_FIND_ADAPTERS);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (list_length > HPI_MAX_ADAPTERS) {
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        HPI_MAX_ADAPTERS * sizeof(u16));
-                memset(&aw_adapter_list[HPI_MAX_ADAPTERS], 0,
-                        (list_length - HPI_MAX_ADAPTERS) * sizeof(u16));
-        } else
-                memcpy(aw_adapter_list, &hr.u.s.aw_adapter_list,
-                        list_length * sizeof(u16));
-        *pw_num_adapters = hr.u.s.num_adapters;
-
-        return hr.error;
-}
-
-u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,
-        const struct hpi_resource *p_resource, u16 *pw_adapter_index)
+u16 hpi_subsys_create_adapter(const struct hpi_resource *p_resource,
+        u16 *pw_adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -210,20 +121,18 @@ u16 hpi_subsys_create_adapter(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_subsys_delete_adapter(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index)
+u16 hpi_subsys_delete_adapter(u16 adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_DELETE_ADAPTER);
-        hm.adapter_index = adapter_index;
+        hm.obj_index = adapter_index;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
-        int *pn_num_adapters)
+u16 hpi_subsys_get_num_adapters(int *pn_num_adapters)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -234,35 +143,22 @@ u16 hpi_subsys_get_num_adapters(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_subsys_get_adapter(const struct hpi_hsubsys *ph_subsys, int iterator,
-        u32 *padapter_index, u16 *pw_adapter_type)
+u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,
+        u16 *pw_adapter_type)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_GET_ADAPTER);
-        hm.adapter_index = (u16)iterator;
+        hm.obj_index = (u16)iterator;
         hpi_send_recv(&hm, &hr);
         *padapter_index = (int)hr.u.s.adapter_index;
-        *pw_adapter_type = hr.u.s.aw_adapter_list[0];
-        return hr.error;
-}
+        *pw_adapter_type = hr.u.s.adapter_type;
 
-u16 hpi_subsys_set_host_network_interface(const struct hpi_hsubsys *ph_subsys,
-        const char *sz_interface)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
-                HPI_SUBSYS_SET_NETWORK_INTERFACE);
-        if (sz_interface == NULL)
-                return HPI_ERROR_INVALID_RESOURCE;
-        hm.u.s.resource.r.net_if = sz_interface;
-        hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
+u16 hpi_adapter_open(u16 adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -276,7 +172,7 @@ u16 hpi_adapter_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
 
 }
 
-u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
+u16 hpi_adapter_close(u16 adapter_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -289,15 +185,14 @@ u16 hpi_adapter_close(const struct hpi_hsubsys *ph_subsys, u16 adapter_index)
         return hr.error;
 }
 
-u16 hpi_adapter_set_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode)
+u16 hpi_adapter_set_mode(u16 adapter_index, u32 adapter_mode)
 {
-        return hpi_adapter_set_mode_ex(ph_subsys, adapter_index, adapter_mode,
+        return hpi_adapter_set_mode_ex(adapter_index, adapter_mode,
                 HPI_ADAPTER_MODE_SET);
 }
 
-u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 adapter_mode, u16 query_or_set)
+u16 hpi_adapter_set_mode_ex(u16 adapter_index, u32 adapter_mode,
+        u16 query_or_set)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -305,14 +200,13 @@ u16 hpi_adapter_set_mode_ex(const struct hpi_hsubsys *ph_subsys,
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
                 HPI_ADAPTER_SET_MODE);
         hm.adapter_index = adapter_index;
-        hm.u.a.adapter_mode = adapter_mode;
-        hm.u.a.assert_id = query_or_set;
+        hm.u.ax.mode.adapter_mode = adapter_mode;
+        hm.u.ax.mode.query_or_set = query_or_set;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *padapter_mode)
+u16 hpi_adapter_get_mode(u16 adapter_index, u32 *padapter_mode)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -321,13 +215,13 @@ u16 hpi_adapter_get_mode(const struct hpi_hsubsys *ph_subsys,
         hm.adapter_index = adapter_index;
         hpi_send_recv(&hm, &hr);
         if (padapter_mode)
-                *padapter_mode = hr.u.a.serial_number;
+                *padapter_mode = hr.u.ax.mode.adapter_mode;
         return hr.error;
 }
 
-u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *pw_num_outstreams, u16 *pw_num_instreams,
-        u16 *pw_version, u32 *pserial_number, u16 *pw_adapter_type)
+u16 hpi_adapter_get_info(u16 adapter_index, u16 *pw_num_outstreams,
+        u16 *pw_num_instreams, u16 *pw_version, u32 *pserial_number,
+        u16 *pw_adapter_type)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -337,18 +231,17 @@ u16 hpi_adapter_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_send_recv(&hm, &hr);
 
-        *pw_adapter_type = hr.u.a.adapter_type;
-        *pw_num_outstreams = hr.u.a.num_outstreams;
-        *pw_num_instreams = hr.u.a.num_instreams;
-        *pw_version = hr.u.a.version;
-        *pserial_number = hr.u.a.serial_number;
+        *pw_adapter_type = hr.u.ax.info.adapter_type;
+        *pw_num_outstreams = hr.u.ax.info.num_outstreams;
+        *pw_num_instreams = hr.u.ax.info.num_instreams;
+        *pw_version = hr.u.ax.info.version;
+        *pserial_number = hr.u.ax.info.serial_number;
         return hr.error;
 }
 
-u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 module_index, u16 *pw_num_outputs,
-        u16 *pw_num_inputs, u16 *pw_version, u32 *pserial_number,
-        u16 *pw_module_type, u32 *ph_module)
+u16 hpi_adapter_get_module_by_index(u16 adapter_index, u16 module_index,
+        u16 *pw_num_outputs, u16 *pw_num_inputs, u16 *pw_version,
+        u32 *pserial_number, u16 *pw_module_type, u32 *ph_module)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -360,173 +253,18 @@ u16 hpi_adapter_get_module_by_index(const struct hpi_hsubsys *ph_subsys,
 
         hpi_send_recv(&hm, &hr);
 
-        *pw_module_type = hr.u.a.adapter_type;
-        *pw_num_outputs = hr.u.a.num_outstreams;
-        *pw_num_inputs = hr.u.a.num_instreams;
-        *pw_version = hr.u.a.version;
-        *pserial_number = hr.u.a.serial_number;
+        *pw_module_type = hr.u.ax.info.adapter_type;
+        *pw_num_outputs = hr.u.ax.info.num_outstreams;
+        *pw_num_inputs = hr.u.ax.info.num_instreams;
+        *pw_version = hr.u.ax.info.version;
+        *pserial_number = hr.u.ax.info.serial_number;
         *ph_module = 0;
 
         return hr.error;
 }
 
-u16 hpi_adapter_get_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u16 *pw_line_number)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_GET_ASSERT);
-        hm.adapter_index = adapter_index;
-        hpi_send_recv(&hm, &hr);
-
-        *assert_present = 0;
-
-        if (!hr.error) {
-
-                *pw_line_number = (u16)hr.u.a.serial_number;
-                if (*pw_line_number) {
-
-                        int i;
-                        char *src = (char *)hr.u.a.sz_adapter_assert;
-                        char *dst = psz_assert;
-
-                        *assert_present = 1;
-
-                        for (i = 0; i < HPI_STRING_LEN; i++) {
-                                char c;
-                                c = *src++;
-                                *dst++ = c;
-                                if (c == 0)
-                                        break;
-                        }
-
-                }
-        }
-        return hr.error;
-}
-
-u16 hpi_adapter_get_assert_ex(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 *assert_present, char *psz_assert,
-        u32 *pline_number, u16 *pw_assert_on_dsp)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_GET_ASSERT);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *assert_present = 0;
-
-        if (!hr.error) {
-
-                *pline_number = hr.u.a.serial_number;
-
-                *assert_present = hr.u.a.adapter_type;
-
-                *pw_assert_on_dsp = hr.u.a.adapter_index;
-
-                if (!*assert_present && *pline_number)
-
-                        *assert_present = 1;
-
-                if (*assert_present) {
-
-                        int i;
-                        char *src = (char *)hr.u.a.sz_adapter_assert;
-                        char *dst = psz_assert;
-
-                        for (i = 0; i < HPI_STRING_LEN; i++) {
-                                char c;
-                                c = *src++;
-                                *dst++ = c;
-                                if (c == 0)
-                                        break;
-                        }
-
-                } else {
-                        *psz_assert = 0;
-                }
-        }
-        return hr.error;
-}
-
-u16 hpi_adapter_test_assert(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 assert_id)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_TEST_ASSERT);
-        hm.adapter_index = adapter_index;
-        hm.u.a.assert_id = assert_id;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_adapter_enable_capability(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 capability, u32 key)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_ENABLE_CAPABILITY);
-        hm.adapter_index = adapter_index;
-        hm.u.a.assert_id = capability;
-        hm.u.a.adapter_mode = key;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_adapter_self_test(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_SELFTEST);
-        hm.adapter_index = adapter_index;
-        hpi_send_recv(&hm, &hr);
-        return hr.error;
-}
-
-u16 hpi_adapter_debug_read(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 dsp_address, char *p_buffer, int *count_bytes)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
-                HPI_ADAPTER_DEBUG_READ);
-
-        hr.size = sizeof(hr);
-
-        hm.adapter_index = adapter_index;
-        hm.u.ax.debug_read.dsp_address = dsp_address;
-
-        if (*count_bytes > (int)sizeof(hr.u.bytes))
-                *count_bytes = sizeof(hr.u.bytes);
-
-        hm.u.ax.debug_read.count_bytes = *count_bytes;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (!hr.error) {
-                *count_bytes = hr.size - 12;
-                memcpy(p_buffer, &hr.u.bytes, *count_bytes);
-        } else
-                *count_bytes = 0;
-        return hr.error;
-}
-
-u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 parameter1, u16 parameter2)
+u16 hpi_adapter_set_property(u16 adapter_index, u16 property, u16 parameter1,
+        u16 parameter2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -542,9 +280,8 @@ u16 hpi_adapter_set_property(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 property, u16 *pw_parameter1,
-        u16 *pw_parameter2)
+u16 hpi_adapter_get_property(u16 adapter_index, u16 property,
+        u16 *pw_parameter1, u16 *pw_parameter2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -564,9 +301,8 @@ u16 hpi_adapter_get_property(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 index, u16 what_to_enumerate,
-        u16 property_index, u32 *psetting)
+u16 hpi_adapter_enumerate_property(u16 adapter_index, u16 index,
+        u16 what_to_enumerate, u16 property_index, u32 *psetting)
 {
         return 0;
 }
@@ -574,7 +310,7 @@ u16 hpi_adapter_enumerate_property(const struct hpi_hsubsys *ph_subsys,
 u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         u32 sample_rate, u32 bit_rate, u32 attributes)
 {
-        u16 error = 0;
+        u16 err = 0;
         struct hpi_msg_format fmt;
 
         switch (channels) {
@@ -586,8 +322,8 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         case 16:
                 break;
         default:
-                error = HPI_ERROR_INVALID_CHANNELS;
-                return error;
+                err = HPI_ERROR_INVALID_CHANNELS;
+                return err;
         }
         fmt.channels = channels;
 
@@ -610,17 +346,17 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         case HPI_FORMAT_OEM2:
                 break;
         default:
-                error = HPI_ERROR_INVALID_FORMAT;
-                return error;
+                err = HPI_ERROR_INVALID_FORMAT;
+                return err;
         }
         fmt.format = format;
 
         if (sample_rate < 8000L) {
-                error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
+                err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
                 sample_rate = 8000L;
         }
         if (sample_rate > 200000L) {
-                error = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
+                err = HPI_ERROR_INCOMPATIBLE_SAMPLERATE;
                 sample_rate = 200000L;
         }
         fmt.sample_rate = sample_rate;
@@ -651,10 +387,10 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
                 if ((channels == 1)
                         && (attributes != HPI_MPEG_MODE_DEFAULT)) {
                         attributes = HPI_MPEG_MODE_DEFAULT;
-                        error = HPI_ERROR_INVALID_FORMAT;
+                        err = HPI_ERROR_INVALID_FORMAT;
                 } else if (attributes > HPI_MPEG_MODE_DUALCHANNEL) {
                         attributes = HPI_MPEG_MODE_DEFAULT;
-                        error = HPI_ERROR_INVALID_FORMAT;
+                        err = HPI_ERROR_INVALID_FORMAT;
                 }
                 fmt.attributes = attributes;
                 break;
@@ -663,7 +399,7 @@ u16 hpi_format_create(struct hpi_format *p_format, u16 channels, u16 format,
         }
 
         hpi_msg_to_format(p_format, &fmt);
-        return error;
+        return err;
 }
 
 u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,
@@ -712,8 +448,8 @@ u16 hpi_stream_estimate_buffer_size(struct hpi_format *p_format,
         return 0;
 }
 
-u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 outstream_index, u32 *ph_outstream)
+u16 hpi_outstream_open(u16 adapter_index, u16 outstream_index,
+        u32 *ph_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -733,38 +469,41 @@ u16 hpi_outstream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_outstream_close(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_close(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_CLOSE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_to_play,
-        u32 *psamples_played, u32 *pauxiliary_data_to_play)
+u16 hpi_outstream_get_info_ex(u32 h_outstream, u16 *pw_state,
+        u32 *pbuffer_size, u32 *pdata_to_play, u32 *psamples_played,
+        u32 *pauxiliary_data_to_play)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
@@ -782,15 +521,15 @@ u16 hpi_outstream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, const u8 *pb_data, u32 bytes_to_write,
-        const struct hpi_format *p_format)
+u16 hpi_outstream_write_buf(u32 h_outstream, const u8 *pb_data,
+        u32 bytes_to_write, const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_WRITE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)pb_data;
         hm.u.d.u.data.data_size = bytes_to_write;
 
@@ -801,82 +540,85 @@ u16 hpi_outstream_write_buf(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_start(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_start(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_START);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_wait_start(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_WAIT_START);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_stop(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_STOP);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_sinegen(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_sinegen(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SINEGEN);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_outstream)
+u16 hpi_outstream_reset(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format)
+u16 hpi_outstream_query_format(u32 h_outstream, struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_QUERY_FORMAT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
@@ -885,15 +627,15 @@ u16 hpi_outstream_query_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_format *p_format)
+u16 hpi_outstream_set_format(u32 h_outstream, struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_FORMAT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
@@ -902,15 +644,15 @@ u16 hpi_outstream_set_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, short velocity)
+u16 hpi_outstream_set_velocity(u32 h_outstream, short velocity)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_VELOCITY);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.velocity = velocity;
 
         hpi_send_recv(&hm, &hr);
@@ -918,15 +660,16 @@ u16 hpi_outstream_set_velocity(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 punch_in_sample, u32 punch_out_sample)
+u16 hpi_outstream_set_punch_in_out(u32 h_outstream, u32 punch_in_sample,
+        u32 punch_out_sample)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_PUNCHINOUT);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.d.u.pio.punch_in_sample = punch_in_sample;
         hm.u.d.u.pio.punch_out_sample = punch_out_sample;
@@ -936,29 +679,29 @@ u16 hpi_outstream_set_punch_in_out(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u16 mode)
+u16 hpi_outstream_ancillary_reset(u32 h_outstream, u16 mode)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.format.channels = mode;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *pframes_available)
+u16 hpi_outstream_ancillary_get_info(u32 h_outstream, u32 *pframes_available)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         if (hr.error == 0) {
                 if (pframes_available)
@@ -969,8 +712,8 @@ u16 hpi_outstream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_outstream_ancillary_read(u32 h_outstream,
+        struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_read)
 {
@@ -979,7 +722,8 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_ANC_READ);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;
         hm.u.d.u.data.data_size =
                 number_of_ancillary_frames_to_read *
@@ -987,19 +731,19 @@ u16 hpi_outstream_ancillary_read(const struct hpi_hsubsys *ph_subsys,
         if (hm.u.d.u.data.data_size <= anc_frame_buffer_size_in_bytes)
                 hpi_send_recv(&hm, &hr);
         else
-                hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;
+                hr.error = HPI_ERROR_INVALID_DATASIZE;
         return hr.error;
 }
 
-u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 time_scale)
+u16 hpi_outstream_set_time_scale(u32 h_outstream, u32 time_scale)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_SET_TIMESCALE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.d.u.time_scale = time_scale;
 
@@ -1008,22 +752,21 @@ u16 hpi_outstream_set_time_scale(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 size_in_bytes)
+u16 hpi_outstream_host_buffer_allocate(u32 h_outstream, u32 size_in_bytes)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_ALLOC);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = size_in_bytes;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u8 **pp_buffer,
+u16 hpi_outstream_host_buffer_get_info(u32 h_outstream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status)
 {
         struct hpi_message hm;
@@ -1031,7 +774,8 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_GET_INFO);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (hr.error == 0) {
@@ -1043,21 +787,20 @@ u16 hpi_outstream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_host_buffer_free(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 h_stream)
+u16 hpi_outstream_group_add(u32 h_outstream, u32 h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1066,22 +809,22 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_ADD);
-        hr.error = 0;
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
+        if (hpi_handle_indexes(h_stream, &adapter,
+                        &hm.u.d.u.stream.stream_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         c_obj_type = hpi_handle_object(h_stream);
         switch (c_obj_type) {
         case HPI_OBJ_OSTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
-                break;
         case HPI_OBJ_ISTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
+                hm.u.d.u.stream.object_type = c_obj_type;
                 break;
         default:
-                return HPI_ERROR_INVALID_STREAM;
+                return HPI_ERROR_INVALID_OBJ;
         }
         if (adapter != hm.adapter_index)
                 return HPI_ERROR_NO_INTERADAPTER_GROUPS;
@@ -1090,15 +833,16 @@ u16 hpi_outstream_group_add(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream, u32 *poutstream_map, u32 *pinstream_map)
+u16 hpi_outstream_group_get_map(u32 h_outstream, u32 *poutstream_map,
+        u32 *pinstream_map)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_GETMAP);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (poutstream_map)
@@ -1109,21 +853,20 @@ u16 hpi_outstream_group_get_map(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_outstream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_outstream)
+u16 hpi_outstream_group_reset(u32 h_outstream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                 HPI_OSTREAM_GROUP_RESET);
-        u32TOINDEXES(h_outstream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_outstream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u16 instream_index, u32 *ph_instream)
+u16 hpi_instream_open(u16 adapter_index, u16 instream_index, u32 *ph_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1145,38 +888,40 @@ u16 hpi_instream_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_instream_close(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_close(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_CLOSE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index);
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format)
+u16 hpi_instream_query_format(u32 h_instream,
+        const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_QUERY_FORMAT);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
         hpi_send_recv(&hm, &hr);
@@ -1184,15 +929,15 @@ u16 hpi_instream_query_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_format *p_format)
+u16 hpi_instream_set_format(u32 h_instream, const struct hpi_format *p_format)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_SET_FORMAT);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_format_to_msg(&hm.u.d.u.data.format, p_format);
 
         hpi_send_recv(&hm, &hr);
@@ -1200,15 +945,15 @@ u16 hpi_instream_set_format(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
-        u8 *pb_data, u32 bytes_to_read)
+u16 hpi_instream_read_buf(u32 h_instream, u8 *pb_data, u32 bytes_to_read)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_READ);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = bytes_to_read;
         hm.u.d.u.data.pb_data = pb_data;
 
@@ -1217,72 +962,76 @@ u16 hpi_instream_read_buf(const struct hpi_hsubsys *ph_subsys, u32 h_instream,
         return hr.error;
 }
 
-u16 hpi_instream_start(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_start(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_START);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_wait_start(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_wait_start(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_WAIT_START);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_stop(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_stop(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_STOP);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_reset(const struct hpi_hsubsys *ph_subsys, u32 h_instream)
+u16 hpi_instream_reset(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
         return hr.error;
 }
 
-u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 *pw_state, u32 *pbuffer_size, u32 *pdata_recorded,
-        u32 *psamples_recorded, u32 *pauxiliary_data_recorded)
+u16 hpi_instream_get_info_ex(u32 h_instream, u16 *pw_state, u32 *pbuffer_size,
+        u32 *pdata_recorded, u32 *psamples_recorded,
+        u32 *pauxiliary_data_recorded)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hpi_send_recv(&hm, &hr);
 
@@ -1300,15 +1049,15 @@ u16 hpi_instream_get_info_ex(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u16 bytes_per_frame, u16 mode, u16 alignment,
-        u16 idle_bit)
+u16 hpi_instream_ancillary_reset(u32 h_instream, u16 bytes_per_frame,
+        u16 mode, u16 alignment, u16 idle_bit)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.format.attributes = bytes_per_frame;
         hm.u.d.u.data.format.format = (mode << 8) | (alignment & 0xff);
         hm.u.d.u.data.format.channels = idle_bit;
@@ -1316,14 +1065,14 @@ u16 hpi_instream_ancillary_reset(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *pframe_space)
+u16 hpi_instream_ancillary_get_info(u32 h_instream, u32 *pframe_space)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         if (pframe_space)
                 *pframe_space =
@@ -1333,8 +1082,8 @@ u16 hpi_instream_ancillary_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, const struct hpi_anc_frame *p_anc_frame_buffer,
+u16 hpi_instream_ancillary_write(u32 h_instream,
+        const struct hpi_anc_frame *p_anc_frame_buffer,
         u32 anc_frame_buffer_size_in_bytes,
         u32 number_of_ancillary_frames_to_write)
 {
@@ -1343,7 +1092,8 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_ANC_WRITE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.pb_data = (u8 *)p_anc_frame_buffer;
         hm.u.d.u.data.data_size =
                 number_of_ancillary_frames_to_write *
@@ -1351,12 +1101,11 @@ u16 hpi_instream_ancillary_write(const struct hpi_hsubsys *ph_subsys,
         if (hm.u.d.u.data.data_size <= anc_frame_buffer_size_in_bytes)
                 hpi_send_recv(&hm, &hr);
         else
-                hr.error = HPI_ERROR_INVALID_DATA_TRANSFER;
+                hr.error = HPI_ERROR_INVALID_DATASIZE;
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 size_in_bytes)
+u16 hpi_instream_host_buffer_allocate(u32 h_instream, u32 size_in_bytes)
 {
 
         struct hpi_message hm;
@@ -1364,14 +1113,14 @@ u16 hpi_instream_host_buffer_allocate(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_ALLOC);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.d.u.data.data_size = size_in_bytes;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u8 **pp_buffer,
+u16 hpi_instream_host_buffer_get_info(u32 h_instream, u8 **pp_buffer,
         struct hpi_hostbuffer_status **pp_status)
 {
         struct hpi_message hm;
@@ -1379,7 +1128,8 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_GET_INFO);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (hr.error == 0) {
@@ -1391,8 +1141,7 @@ u16 hpi_instream_host_buffer_get_info(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_host_buffer_free(u32 h_instream)
 {
 
         struct hpi_message hm;
@@ -1400,13 +1149,13 @@ u16 hpi_instream_host_buffer_free(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 h_stream)
+u16 hpi_instream_group_add(u32 h_instream, u32 h_stream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1416,22 +1165,23 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_ADD);
         hr.error = 0;
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
+        if (hpi_handle_indexes(h_stream, &adapter,
+                        &hm.u.d.u.stream.stream_index))
+                return HPI_ERROR_INVALID_HANDLE;
+
         c_obj_type = hpi_handle_object(h_stream);
 
         switch (c_obj_type) {
         case HPI_OBJ_OSTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_OSTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
-                break;
         case HPI_OBJ_ISTREAM:
-                hm.u.d.u.stream.object_type = HPI_OBJ_ISTREAM;
-                u32TOINDEXES(h_stream, &adapter,
-                        &hm.u.d.u.stream.stream_index);
+                hm.u.d.u.stream.object_type = c_obj_type;
                 break;
         default:
-                return HPI_ERROR_INVALID_STREAM;
+                return HPI_ERROR_INVALID_OBJ;
         }
 
         if (adapter != hm.adapter_index)
@@ -1441,15 +1191,16 @@ u16 hpi_instream_group_add(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream, u32 *poutstream_map, u32 *pinstream_map)
+u16 hpi_instream_group_get_map(u32 h_instream, u32 *poutstream_map,
+        u32 *pinstream_map)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_HOSTBUFFER_FREE);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
 
         if (poutstream_map)
@@ -1460,21 +1211,20 @@ u16 hpi_instream_group_get_map(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_instream_group_reset(const struct hpi_hsubsys *ph_subsys,
-        u32 h_instream)
+u16 hpi_instream_group_reset(u32 h_instream)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                 HPI_ISTREAM_GROUP_RESET);
-        u32TOINDEXES(h_instream, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_instream, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_mixer)
+u16 hpi_mixer_open(u16 adapter_index, u32 *ph_mixer)
 {
         struct hpi_message hm;
         struct hpi_response hr;
@@ -1492,25 +1242,29 @@ u16 hpi_mixer_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
         return hr.error;
 }
 
-u16 hpi_mixer_close(const struct hpi_hsubsys *ph_subsys, u32 h_mixer)
+u16 hpi_mixer_close(u32 h_mixer)
 {
         struct hpi_message hm;
         struct hpi_response hr;
+
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER, HPI_MIXER_CLOSE);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
+
         hpi_send_recv(&hm, &hr);
         return hr.error;
 }
 
-u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        u16 src_node_type, u16 src_node_type_index, u16 dst_node_type,
-        u16 dst_node_type_index, u16 control_type, u32 *ph_control)
+u16 hpi_mixer_get_control(u32 h_mixer, u16 src_node_type,
+        u16 src_node_type_index, u16 dst_node_type, u16 dst_node_type_index,
+        u16 control_type, u32 *ph_control)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER,
                 HPI_MIXER_GET_CONTROL);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.m.node_type1 = src_node_type;
         hm.u.m.node_index1 = src_node_type_index;
         hm.u.m.node_type2 = dst_node_type;
@@ -1528,16 +1282,16 @@ u16 hpi_mixer_get_control(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
         return hr.error;
 }
 
-u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_mixer, u16 control_index, u16 *pw_src_node_type,
-        u16 *pw_src_node_index, u16 *pw_dst_node_type, u16 *pw_dst_node_index,
-        u16 *pw_control_type, u32 *ph_control)
+u16 hpi_mixer_get_control_by_index(u32 h_mixer, u16 control_index,
+        u16 *pw_src_node_type, u16 *pw_src_node_index, u16 *pw_dst_node_type,
+        u16 *pw_dst_node_index, u16 *pw_control_type, u32 *ph_control)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER,
                 HPI_MIXER_GET_CONTROL_BY_INDEX);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.m.control_index = control_index;
         hpi_send_recv(&hm, &hr);
 
@@ -1562,13 +1316,14 @@ u16 hpi_mixer_get_control_by_index(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
-        enum HPI_MIXER_STORE_COMMAND command, u16 index)
+u16 hpi_mixer_store(u32 h_mixer, enum HPI_MIXER_STORE_COMMAND command,
+        u16 index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_MIXER, HPI_MIXER_STORE);
-        u32TOINDEX(h_mixer, &hm.adapter_index);
+        if (hpi_handle_indexes(h_mixer, &hm.adapter_index, NULL))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.mx.store.command = command;
         hm.u.mx.store.index = index;
         hpi_send_recv(&hm, &hr);
@@ -1576,16 +1331,16 @@ u16 hpi_mixer_store(const struct hpi_hsubsys *ph_subsys, u32 h_mixer,
 }
 
 static
-u16 hpi_control_param_set(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, const u32 param1,
-        const u32 param2)
+u16 hpi_control_param_set(const u32 h_control, const u16 attrib,
+        const u32 param1, const u32 param2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = param1;
         hm.u.c.param2 = param2;
@@ -1601,7 +1356,8 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.an_log_value[0] = sv0;
         hm.u.c.an_log_value[1] = sv1;
@@ -1610,16 +1366,16 @@ static u16 hpi_control_log_set2(u32 h_control, u16 attrib, short sv0,
 }
 
 static
-u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, u32 param1, u32 param2,
-        u32 *pparam1, u32 *pparam2)
+u16 hpi_control_param_get(const u32 h_control, const u16 attrib, u32 param1,
+        u32 param2, u32 *pparam1, u32 *pparam2)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = param1;
         hm.u.c.param2 = param2;
@@ -1632,19 +1388,20 @@ u16 hpi_control_param_get(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-#define hpi_control_param1_get(s, h, a, p1) \
-                hpi_control_param_get(s, h, a, 0, 0, p1, NULL)
-#define hpi_control_param2_get(s, h, a, p1, p2) \
-                hpi_control_param_get(s, h, a, 0, 0, p1, p2)
+#define hpi_control_param1_get(h, a, p1) \
+                hpi_control_param_get(h, a, 0, 0, p1, NULL)
+#define hpi_control_param2_get(h, a, p1, p2) \
+                hpi_control_param_get(h, a, 0, 0, p1, p2)
 
-static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attrib, short *sv0, short *sv1)
+static u16 hpi_control_log_get2(u32 h_control, u16 attrib, short *sv0,
+        short *sv1)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = attrib;
 
         hpi_send_recv(&hm, &hr);
@@ -1655,8 +1412,7 @@ static u16 hpi_control_log_get2(const struct hpi_hsubsys *ph_subsys,
 }
 
 static
-u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_control, const u16 attrib, const u32 index,
+u16 hpi_control_query(const u32 h_control, const u16 attrib, const u32 index,
         const u32 param, u32 *psetting)
 {
         struct hpi_message hm;
@@ -1664,7 +1420,8 @@ u16 hpi_control_query(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_INFO);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.c.attribute = attrib;
         hm.u.c.param1 = index;
@@ -1682,7 +1439,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
         unsigned int sub_string_index = 0, j = 0;
         char c = 0;
         unsigned int n = 0;
-        u16 hE = 0;
+        u16 err = 0;
 
         if ((string_length < 1) || (string_length > 256))
                 return HPI_ERROR_INVALID_CONTROL_VALUE;
@@ -1693,7 +1450,9 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
 
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                         HPI_CONTROL_GET_STATE);
-                u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+                if (hpi_handle_indexes(h_control, &hm.adapter_index,
+                                &hm.obj_index))
+                        return HPI_ERROR_INVALID_HANDLE;
                 hm.u.c.attribute = attribute;
                 hm.u.c.param1 = sub_string_index;
                 hm.u.c.param2 = 0;
@@ -1705,7 +1464,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                         return HPI_ERROR_INVALID_CONTROL_VALUE;
 
                 if (hr.error) {
-                        hE = hr.error;
+                        err = hr.error;
                         break;
                 }
                 for (j = 0; j < 8; j++) {
@@ -1714,7 +1473,7 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                         n++;
                         if (n >= string_length) {
                                 psz_string[string_length - 1] = 0;
-                                hE = HPI_ERROR_INVALID_CONTROL_VALUE;
+                                err = HPI_ERROR_INVALID_CONTROL_VALUE;
                                 break;
                         }
                         if (c == 0)
@@ -1730,57 +1489,52 @@ static u16 hpi_control_get_string(const u32 h_control, const u16 attribute,
                 if (c == 0)
                         break;
         }
-        return hE;
+        return err;
 }
 
-u16 HPI_AESEBU__receiver_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_rx, const u32 index, u16 *pw_format)
+u16 hpi_aesebu_receiver_query_format(const u32 h_aes_rx, const u32 index,
+        u16 *pw_format)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_aes_rx, HPI_AESEBURX_FORMAT,
-                index, 0, &qr);
+        err = hpi_control_query(h_aes_rx, HPI_AESEBURX_FORMAT, index, 0, &qr);
         *pw_format = (u16)qr;
         return err;
 }
 
-u16 HPI_AESEBU__receiver_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 format)
+u16 hpi_aesebu_receiver_set_format(u32 h_control, u16 format)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBURX_FORMAT, format, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBURX_FORMAT, format,
+                0);
 }
 
-u16 HPI_AESEBU__receiver_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_format)
+u16 hpi_aesebu_receiver_get_format(u32 h_control, u16 *pw_format)
 {
         u16 err;
         u32 param;
 
-        err = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_FORMAT, &param);
+        err = hpi_control_param1_get(h_control, HPI_AESEBURX_FORMAT, &param);
         if (!err && pw_format)
                 *pw_format = (u16)param;
 
         return err;
 }
 
-u16 HPI_AESEBU__receiver_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_aesebu_receiver_get_sample_rate(u32 h_control, u32 *psample_rate)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_SAMPLERATE, psample_rate);
+        return hpi_control_param1_get(h_control, HPI_AESEBURX_SAMPLERATE,
+                psample_rate);
 }
 
-u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_receiver_get_user_data(u32 h_control, u16 index, u16 *pw_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_AESEBURX_USERDATA;
         hm.u.c.param1 = index;
 
@@ -1791,14 +1545,15 @@ u16 HPI_AESEBU__receiver_get_user_data(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_receiver_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_AESEBURX_CHANNELSTATUS;
         hm.u.c.param1 = index;
 
@@ -1809,101 +1564,93 @@ u16 HPI_AESEBU__receiver_get_channel_status(const struct hpi_hsubsys
         return hr.error;
 }
 
-u16 HPI_AESEBU__receiver_get_error_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_error_data)
+u16 hpi_aesebu_receiver_get_error_status(u32 h_control, u16 *pw_error_data)
 {
         u32 error_data = 0;
-        u16 error = 0;
+        u16 err = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBURX_ERRORSTATUS, &error_data);
+        err = hpi_control_param1_get(h_control, HPI_AESEBURX_ERRORSTATUS,
+                &error_data);
         if (pw_error_data)
                 *pw_error_data = (u16)error_data;
-        return error;
+        return err;
 }
 
-u16 HPI_AESEBU__transmitter_set_sample_rate(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u32 sample_rate)
+u16 hpi_aesebu_transmitter_set_sample_rate(u32 h_control, u32 sample_rate)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_SAMPLERATE, sample_rate, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_SAMPLERATE,
+                sample_rate, 0);
 }
 
-u16 HPI_AESEBU__transmitter_set_user_data(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 data)
+u16 hpi_aesebu_transmitter_set_user_data(u32 h_control, u16 index, u16 data)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_USERDATA, index, data);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_USERDATA, index,
+                data);
 }
 
-u16 HPI_AESEBU__transmitter_set_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 data)
+u16 hpi_aesebu_transmitter_set_channel_status(u32 h_control, u16 index,
+        u16 data)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_CHANNELSTATUS, index, data);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_CHANNELSTATUS,
+                index, data);
 }
 
-u16 HPI_AESEBU__transmitter_get_channel_status(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, u16 index, u16 *pw_data)
+u16 hpi_aesebu_transmitter_get_channel_status(u32 h_control, u16 index,
+        u16 *pw_data)
 {
         return HPI_ERROR_INVALID_OPERATION;
 }
 
-u16 HPI_AESEBU__transmitter_query_format(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_aes_tx, const u32 index, u16 *pw_format)
+u16 hpi_aesebu_transmitter_query_format(const u32 h_aes_tx, const u32 index,
+        u16 *pw_format)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_aes_tx, HPI_AESEBUTX_FORMAT,
-                index, 0, &qr);
+        err = hpi_control_query(h_aes_tx, HPI_AESEBUTX_FORMAT, index, 0, &qr);
         *pw_format = (u16)qr;
         return err;
 }
 
-u16 HPI_AESEBU__transmitter_set_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 output_format)
+u16 hpi_aesebu_transmitter_set_format(u32 h_control, u16 output_format)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_AESEBUTX_FORMAT, output_format, 0);
+        return hpi_control_param_set(h_control, HPI_AESEBUTX_FORMAT,
+                output_format, 0);
 }
 
-u16 HPI_AESEBU__transmitter_get_format(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_output_format)
+u16 hpi_aesebu_transmitter_get_format(u32 h_control, u16 *pw_output_format)
 {
         u16 err;
         u32 param;
 
-        err = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_AESEBUTX_FORMAT, &param);
+        err = hpi_control_param1_get(h_control, HPI_AESEBUTX_FORMAT, &param);
         if (!err && pw_output_format)
                 *pw_output_format = (u16)param;
 
         return err;
 }
 
-u16 hpi_bitstream_set_clock_edge(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 edge_type)
+u16 hpi_bitstream_set_clock_edge(u32 h_control, u16 edge_type)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_BITSTREAM_CLOCK_EDGE, edge_type, 0);
+        return hpi_control_param_set(h_control, HPI_BITSTREAM_CLOCK_EDGE,
+                edge_type, 0);
 }
 
-u16 hpi_bitstream_set_data_polarity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 polarity)
+u16 hpi_bitstream_set_data_polarity(u32 h_control, u16 polarity)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_BITSTREAM_DATA_POLARITY, polarity, 0);
+        return hpi_control_param_set(h_control, HPI_BITSTREAM_DATA_POLARITY,
+                polarity, 0);
 }
 
-u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_clk_activity, u16 *pw_data_activity)
+u16 hpi_bitstream_get_activity(u32 h_control, u16 *pw_clk_activity,
+        u16 *pw_data_activity)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_BITSTREAM_ACTIVITY;
         hpi_send_recv(&hm, &hr);
         if (pw_clk_activity)
@@ -1913,45 +1660,43 @@ u16 hpi_bitstream_get_activity(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_channel_mode_query_mode(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_mode, const u32 index, u16 *pw_mode)
+u16 hpi_channel_mode_query_mode(const u32 h_mode, const u32 index,
+        u16 *pw_mode)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_mode, HPI_CHANNEL_MODE_MODE,
-                index, 0, &qr);
+        err = hpi_control_query(h_mode, HPI_CHANNEL_MODE_MODE, index, 0, &qr);
         *pw_mode = (u16)qr;
         return err;
 }
 
-u16 hpi_channel_mode_set(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 mode)
+u16 hpi_channel_mode_set(u32 h_control, u16 mode)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_CHANNEL_MODE_MODE, mode, 0);
+        return hpi_control_param_set(h_control, HPI_CHANNEL_MODE_MODE, mode,
+                0);
 }
 
-u16 hpi_channel_mode_get(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *mode)
+u16 hpi_channel_mode_get(u32 h_control, u16 *mode)
 {
         u32 mode32 = 0;
-        u16 error = hpi_control_param1_get(ph_subsys, h_control,
+        u16 err = hpi_control_param1_get(h_control,
                 HPI_CHANNEL_MODE_MODE, &mode32);
         if (mode)
                 *mode = (u16)mode32;
-        return error;
+        return err;
 }
 
-u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 byte_count, u8 *pb_data)
+u16 hpi_cobranet_hmi_write(u32 h_control, u32 hmi_address, u32 byte_count,
+        u8 *pb_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.u.cobranet_data.byte_count = byte_count;
         hm.u.cx.u.cobranet_data.hmi_address = hmi_address;
@@ -1969,15 +1714,16 @@ u16 hpi_cobranet_hmi_write(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 hmi_address, u32 max_byte_count, u32 *pbyte_count, u8 *pb_data)
+u16 hpi_cobranet_hmi_read(u32 h_control, u32 hmi_address, u32 max_byte_count,
+        u32 *pbyte_count, u8 *pb_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.u.cobranet_data.byte_count = max_byte_count;
         hm.u.cx.u.cobranet_data.hmi_address = hmi_address;
@@ -2008,16 +1754,16 @@ u16 hpi_cobranet_hmi_read(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pstatus, u32 *preadable_size,
-        u32 *pwriteable_size)
+u16 hpi_cobranet_hmi_get_status(u32 h_control, u32 *pstatus,
+        u32 *preadable_size, u32 *pwriteable_size)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROLEX,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.cx.attribute = HPI_COBRANET_GET_STATUS;
 
@@ -2035,177 +1781,176 @@ u16 hpi_cobranet_hmi_get_status(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_cobranet_getI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress)
+u16 hpi_cobranet_get_ip_address(u32 h_control, u32 *pdw_ip_address)
 {
         u32 byte_count;
         u32 iP;
-        u16 error;
+        u16 err;
 
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, &byte_count,
                 (u8 *)&iP);
 
-        *pi_paddress =
+        *pdw_ip_address =
                 ((iP & 0xff000000) >> 8) | ((iP & 0x00ff0000) << 8) | ((iP &
                         0x0000ff00) >> 8) | ((iP & 0x000000ff) << 8);
 
-        if (error)
-                *pi_paddress = 0;
+        if (err)
+                *pdw_ip_address = 0;
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_setI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress)
+u16 hpi_cobranet_set_ip_address(u32 h_control, u32 dw_ip_address)
 {
         u32 iP;
-        u16 error;
+        u16 err;
 
-        iP = ((i_paddress & 0xff000000) >> 8) | ((i_paddress & 0x00ff0000) <<
-                8) | ((i_paddress & 0x0000ff00) >> 8) | ((i_paddress &
-                        0x000000ff) << 8);
+        iP = ((dw_ip_address & 0xff000000) >> 8) | ((dw_ip_address &
+                        0x00ff0000) << 8) | ((dw_ip_address & 0x0000ff00) >>
+                8) | ((dw_ip_address & 0x000000ff) << 8);
 
-        error = hpi_cobranet_hmi_write(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_write(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_currentIP, 4, (u8 *)&iP);
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_get_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pi_paddress)
+u16 hpi_cobranet_get_static_ip_address(u32 h_control, u32 *pdw_ip_address)
 {
         u32 byte_count;
         u32 iP;
-        u16 error;
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        u16 err;
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, &byte_count,
                 (u8 *)&iP);
 
-        *pi_paddress =
+        *pdw_ip_address =
                 ((iP & 0xff000000) >> 8) | ((iP & 0x00ff0000) << 8) | ((iP &
                         0x0000ff00) >> 8) | ((iP & 0x000000ff) << 8);
 
-        if (error)
-                *pi_paddress = 0;
+        if (err)
+                *pdw_ip_address = 0;
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_set_staticI_paddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 i_paddress)
+u16 hpi_cobranet_set_static_ip_address(u32 h_control, u32 dw_ip_address)
 {
         u32 iP;
-        u16 error;
+        u16 err;
 
-        iP = ((i_paddress & 0xff000000) >> 8) | ((i_paddress & 0x00ff0000) <<
-                8) | ((i_paddress & 0x0000ff00) >> 8) | ((i_paddress &
-                        0x000000ff) << 8);
+        iP = ((dw_ip_address & 0xff000000) >> 8) | ((dw_ip_address &
+                        0x00ff0000) << 8) | ((dw_ip_address & 0x0000ff00) >>
+                8) | ((dw_ip_address & 0x000000ff) << 8);
 
-        error = hpi_cobranet_hmi_write(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_write(h_control,
                 HPI_COBRANET_HMI_cobra_ip_mon_staticIP, 4, (u8 *)&iP);
 
-        return error;
+        return err;
 
 }
 
-u16 hpi_cobranet_getMA_caddress(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pmAC_MS_bs, u32 *pmAC_LS_bs)
+u16 hpi_cobranet_get_macaddress(u32 h_control, u32 *p_mac_msbs,
+        u32 *p_mac_lsbs)
 {
         u32 byte_count;
-        u16 error;
-        u32 mAC;
+        u16 err;
+        u32 mac;
 
-        error = hpi_cobranet_hmi_read(ph_subsys, h_control,
+        err = hpi_cobranet_hmi_read(h_control,
                 HPI_COBRANET_HMI_cobra_if_phy_address, 4, &byte_count,
-                (u8 *)&mAC);
-        *pmAC_MS_bs =
-                ((mAC & 0xff000000) >> 8) | ((mAC & 0x00ff0000) << 8) | ((mAC
-                        & 0x0000ff00) >> 8) | ((mAC & 0x000000ff) << 8);
-        error += hpi_cobranet_hmi_read(ph_subsys, h_control,
-                HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4, &byte_count,
-                (u8 *)&mAC);
-        *pmAC_LS_bs =
-                ((mAC & 0xff000000) >> 8) | ((mAC & 0x00ff0000) << 8) | ((mAC
-                        & 0x0000ff00) >> 8) | ((mAC & 0x000000ff) << 8);
-
-        if (error) {
-                *pmAC_MS_bs = 0;
-                *pmAC_LS_bs = 0;
+                (u8 *)&mac);
+
+        if (!err) {
+                *p_mac_msbs =
+                        ((mac & 0xff000000) >> 8) | ((mac & 0x00ff0000) << 8)
+                        | ((mac & 0x0000ff00) >> 8) | ((mac & 0x000000ff) <<
+                        8);
+
+                err = hpi_cobranet_hmi_read(h_control,
+                        HPI_COBRANET_HMI_cobra_if_phy_address + 1, 4,
+                        &byte_count, (u8 *)&mac);
         }
 
-        return error;
+        if (!err) {
+                *p_mac_lsbs =
+                        ((mac & 0xff000000) >> 8) | ((mac & 0x00ff0000) << 8)
+                        | ((mac & 0x0000ff00) >> 8) | ((mac & 0x000000ff) <<
+                        8);
+        } else {
+                *p_mac_msbs = 0;
+                *p_mac_lsbs = 0;
+        }
+
+        return err;
 }
 
-u16 hpi_compander_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_compander_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_compander_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_compander_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_compander_set_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short makeup_gain0_01dB)
+u16 hpi_compander_set_makeup_gain(u32 h_control, short makeup_gain0_01dB)
 {
         return hpi_control_log_set2(h_control, HPI_COMPANDER_MAKEUPGAIN,
                 makeup_gain0_01dB, 0);
 }
 
-u16 hpi_compander_get_makeup_gain(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *makeup_gain0_01dB)
+u16 hpi_compander_get_makeup_gain(u32 h_control, short *makeup_gain0_01dB)
 {
-        return hpi_control_log_get2(ph_subsys, h_control,
-                HPI_COMPANDER_MAKEUPGAIN, makeup_gain0_01dB, NULL);
+        return hpi_control_log_get2(h_control, HPI_COMPANDER_MAKEUPGAIN,
+                makeup_gain0_01dB, NULL);
 }
 
-u16 hpi_compander_set_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, unsigned int index, u32 attack)
+u16 hpi_compander_set_attack_time_constant(u32 h_control, unsigned int index,
+        u32 attack)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_ATTACK, attack, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_ATTACK, attack,
+                index);
 }
 
-u16 hpi_compander_get_attack_time_constant(const struct hpi_hsubsys
-        *ph_subsys, u32 h_control, unsigned int index, u32 *attack)
+u16 hpi_compander_get_attack_time_constant(u32 h_control, unsigned int index,
+        u32 *attack)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_ATTACK, 0, index, attack, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_ATTACK, 0,
+                index, attack, NULL);
 }
 
-u16 hpi_compander_set_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, u32 decay)
+u16 hpi_compander_set_decay_time_constant(u32 h_control, unsigned int index,
+        u32 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_DECAY, decay, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_DECAY, decay,
+                index);
 }
 
-u16 hpi_compander_get_decay_time_constant(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, u32 *decay)
+u16 hpi_compander_get_decay_time_constant(u32 h_control, unsigned int index,
+        u32 *decay)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_DECAY, 0, index, decay, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_DECAY, 0, index,
+                decay, NULL);
 
 }
 
-u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, short threshold0_01dB)
+u16 hpi_compander_set_threshold(u32 h_control, unsigned int index,
+        short threshold0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;
         hm.u.c.param2 = index;
         hm.u.c.an_log_value[0] = threshold0_01dB;
@@ -2215,15 +1960,16 @@ u16 hpi_compander_set_threshold(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, unsigned int index, short *threshold0_01dB)
+u16 hpi_compander_get_threshold(u32 h_control, unsigned int index,
+        short *threshold0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_COMPANDER_THRESHOLD;
         hm.u.c.param2 = index;
 
@@ -2233,29 +1979,28 @@ u16 hpi_compander_get_threshold(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_compander_set_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 ratio100)
+u16 hpi_compander_set_ratio(u32 h_control, u32 index, u32 ratio100)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_COMPANDER_RATIO, ratio100, index);
+        return hpi_control_param_set(h_control, HPI_COMPANDER_RATIO, ratio100,
+                index);
 }
 
-u16 hpi_compander_get_ratio(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *ratio100)
+u16 hpi_compander_get_ratio(u32 h_control, u32 index, u32 *ratio100)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_COMPANDER_RATIO, 0, index, ratio100, NULL);
+        return hpi_control_param_get(h_control, HPI_COMPANDER_RATIO, 0, index,
+                ratio100, NULL);
 }
 
-u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)
+u16 hpi_level_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_LEVEL_RANGE;
 
         hpi_send_recv(&hm, &hr);
@@ -2273,31 +2018,27 @@ u16 hpi_level_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_level_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_set_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         )
 {
         return hpi_control_log_set2(h_control, HPI_LEVEL_GAIN,
                 an_gain0_01dB[0], an_gain0_01dB[1]);
 }
 
-u16 hpi_level_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB[HPI_MAX_CHANNELS]
+u16 hpi_level_get_gain(u32 h_control, short an_gain0_01dB[HPI_MAX_CHANNELS]
         )
 {
-        return hpi_control_log_get2(ph_subsys, h_control, HPI_LEVEL_GAIN,
+        return hpi_control_log_get2(h_control, HPI_LEVEL_GAIN,
                 &an_gain0_01dB[0], &an_gain0_01dB[1]);
 }
 
-u16 hpi_meter_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_meter, u32 *p_channels)
+u16 hpi_meter_query_channels(const u32 h_meter, u32 *p_channels)
 {
-        return hpi_control_query(ph_subsys, h_meter, HPI_METER_NUM_CHANNELS,
-                0, 0, p_channels);
+        return hpi_control_query(h_meter, HPI_METER_NUM_CHANNELS, 0, 0,
+                p_channels);
 }
 
-u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_peakdB[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_peak(u32 h_control, short an_peakdB[HPI_MAX_CHANNELS]
         )
 {
         short i = 0;
@@ -2307,7 +2048,8 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.obj_index = hm.obj_index;
         hm.u.c.attribute = HPI_METER_PEAK;
 
@@ -2322,8 +2064,7 @@ u16 hpi_meter_get_peak(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_rmsdB[HPI_MAX_CHANNELS]
+u16 hpi_meter_get_rms(u32 h_control, short an_rmsdB[HPI_MAX_CHANNELS]
         )
 {
         short i = 0;
@@ -2333,7 +2074,8 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_METER_RMS;
 
         hpi_send_recv(&hm, &hr);
@@ -2348,22 +2090,20 @@ u16 hpi_meter_get_rms(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_meter_set_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay)
+u16 hpi_meter_set_rms_ballistics(u32 h_control, u16 attack, u16 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_METER_RMS_BALLISTICS, attack, decay);
+        return hpi_control_param_set(h_control, HPI_METER_RMS_BALLISTICS,
+                attack, decay);
 }
 
-u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pn_attack, u16 *pn_decay)
+u16 hpi_meter_get_rms_ballistics(u32 h_control, u16 *pn_attack, u16 *pn_decay)
 {
         u32 attack;
         u32 decay;
         u16 error;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_METER_RMS_BALLISTICS, &attack, &decay);
+        error = hpi_control_param2_get(h_control, HPI_METER_RMS_BALLISTICS,
+                &attack, &decay);
 
         if (pn_attack)
                 *pn_attack = (unsigned short)attack;
@@ -2373,22 +2113,21 @@ u16 hpi_meter_get_rms_ballistics(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_meter_set_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 attack, u16 decay)
+u16 hpi_meter_set_peak_ballistics(u32 h_control, u16 attack, u16 decay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_METER_PEAK_BALLISTICS, attack, decay);
+        return hpi_control_param_set(h_control, HPI_METER_PEAK_BALLISTICS,
+                attack, decay);
 }
 
-u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pn_attack, u16 *pn_decay)
+u16 hpi_meter_get_peak_ballistics(u32 h_control, u16 *pn_attack,
+        u16 *pn_decay)
 {
         u32 attack;
         u32 decay;
         u16 error;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_METER_PEAK_BALLISTICS, &attack, &decay);
+        error = hpi_control_param2_get(h_control, HPI_METER_PEAK_BALLISTICS,
+                &attack, &decay);
 
         if (pn_attack)
                 *pn_attack = (short)attack;
@@ -2398,55 +2137,53 @@ u16 hpi_meter_get_peak_ballistics(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_microphone_set_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off)
+u16 hpi_microphone_set_phantom_power(u32 h_control, u16 on_off)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_MICROPHONE_PHANTOM_POWER, (u32)on_off, 0);
+        return hpi_control_param_set(h_control, HPI_MICROPHONE_PHANTOM_POWER,
+                (u32)on_off, 0);
 }
 
-u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_on_off)
+u16 hpi_microphone_get_phantom_power(u32 h_control, u16 *pw_on_off)
 {
         u16 error = 0;
         u32 on_off = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
+        error = hpi_control_param1_get(h_control,
                 HPI_MICROPHONE_PHANTOM_POWER, &on_off);
         if (pw_on_off)
                 *pw_on_off = (u16)on_off;
         return error;
 }
 
-u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_node_type, u16 source_node_index)
+u16 hpi_multiplexer_set_source(u32 h_control, u16 source_node_type,
+        u16 source_node_index)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_MULTIPLEXER_SOURCE, source_node_type, source_node_index);
+        return hpi_control_param_set(h_control, HPI_MULTIPLEXER_SOURCE,
+                source_node_type, source_node_index);
 }
 
-u16 hpi_multiplexer_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *source_node_type, u16 *source_node_index)
+u16 hpi_multiplexer_get_source(u32 h_control, u16 *source_node_type,
+        u16 *source_node_index)
 {
         u32 node, index;
-        u16 error = hpi_control_param2_get(ph_subsys, h_control,
+        u16 err = hpi_control_param2_get(h_control,
                 HPI_MULTIPLEXER_SOURCE, &node,
                 &index);
         if (source_node_type)
                 *source_node_type = (u16)node;
         if (source_node_index)
                 *source_node_index = (u16)index;
-        return error;
+        return err;
 }
 
-u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *source_node_type,
-        u16 *source_node_index)
+u16 hpi_multiplexer_query_source(u32 h_control, u16 index,
+        u16 *source_node_type, u16 *source_node_index)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_MULTIPLEXER_QUERYSOURCE;
         hm.u.c.param1 = index;
 
@@ -2459,15 +2196,15 @@ u16 hpi_multiplexer_query_source(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_number_of_bands, u16 *pw_on_off)
+u16 hpi_parametric_eq_get_info(u32 h_control, u16 *pw_number_of_bands,
+        u16 *pw_on_off)
 {
         u32 oB = 0;
         u32 oO = 0;
         u16 error = 0;
 
-        error = hpi_control_param2_get(ph_subsys, h_control,
-                HPI_EQUALIZER_NUM_FILTERS, &oO, &oB);
+        error = hpi_control_param2_get(h_control, HPI_EQUALIZER_NUM_FILTERS,
+                &oO, &oB);
         if (pw_number_of_bands)
                 *pw_number_of_bands = (u16)oB;
         if (pw_on_off)
@@ -2475,23 +2212,22 @@ u16 hpi_parametricEQ__get_info(const struct hpi_hsubsys *ph_subsys,
         return error;
 }
 
-u16 hpi_parametricEQ__set_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 on_off)
+u16 hpi_parametric_eq_set_state(u32 h_control, u16 on_off)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_EQUALIZER_NUM_FILTERS, on_off, 0);
+        return hpi_control_param_set(h_control, HPI_EQUALIZER_NUM_FILTERS,
+                on_off, 0);
 }
 
-u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 *pn_type, u32 *pfrequency_hz,
-        short *pnQ100, short *pn_gain0_01dB)
+u16 hpi_parametric_eq_get_band(u32 h_control, u16 index, u16 *pn_type,
+        u32 *pfrequency_hz, short *pnQ100, short *pn_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_EQUALIZER_FILTER;
         hm.u.c.param2 = index;
 
@@ -2509,16 +2245,16 @@ u16 hpi_parametricEQ__get_band(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, u16 type, u32 frequency_hz, short q100,
-        short gain0_01dB)
+u16 hpi_parametric_eq_set_band(u32 h_control, u16 index, u16 type,
+        u32 frequency_hz, short q100, short gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         hm.u.c.param1 = frequency_hz;
         hm.u.c.param2 = (index & 0xFFFFL) + ((u32)type << 16);
@@ -2531,8 +2267,7 @@ u16 hpi_parametricEQ__set_band(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 index, short coeffs[5]
+u16 hpi_parametric_eq_get_coeffs(u32 h_control, u16 index, short coeffs[5]
         )
 {
         struct hpi_message hm;
@@ -2540,7 +2275,8 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_EQUALIZER_COEFFICIENTS;
         hm.u.c.param2 = index;
 
@@ -2555,444 +2291,388 @@ u16 hpi_parametricEQ__get_coeffs(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_sample_clock_query_source(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u16 *pw_source)
+u16 hpi_sample_clock_query_source(const u32 h_clock, const u32 index,
+        u16 *pw_source)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_clock, HPI_SAMPLECLOCK_SOURCE,
-                index, 0, &qr);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE, index, 0,
+                &qr);
         *pw_source = (u16)qr;
         return err;
 }
 
-u16 hpi_sample_clock_set_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source)
+u16 hpi_sample_clock_set_source(u32 h_control, u16 source)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE, source, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE,
+                source, 0);
 }
 
-u16 hpi_sample_clock_get_source(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source)
+u16 hpi_sample_clock_get_source(u32 h_control, u16 *pw_source)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 source = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE, &source);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE,
+                &source);
+        if (!err)
                 if (pw_source)
                         *pw_source = (u16)source;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_query_source_index(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, const u32 source,
-        u16 *pw_source_index)
+u16 hpi_sample_clock_query_source_index(const u32 h_clock, const u32 index,
+        const u32 source, u16 *pw_source_index)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_clock,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, index, source, &qr);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_SOURCE_INDEX, index,
+                source, &qr);
         *pw_source_index = (u16)qr;
         return err;
 }
 
-u16 hpi_sample_clock_set_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 source_index)
+u16 hpi_sample_clock_set_source_index(u32 h_control, u16 source_index)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, source_index, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,
+                source_index, 0);
 }
 
-u16 hpi_sample_clock_get_source_index(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u16 *pw_source_index)
+u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 source_index = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SOURCE_INDEX, &source_index);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SOURCE_INDEX,
+                &source_index);
+        if (!err)
                 if (pw_source_index)
                         *pw_source_index = (u16)source_index;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_query_local_rate(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_clock, const u32 index, u32 *prate)
+u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,
+        u32 *prate)
 {
         u16 err;
-        err = hpi_control_query(ph_subsys, h_clock,
-                HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, index, 0, prate);
+        err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,
+                index, 0, prate);
 
         return err;
 }
 
-u16 hpi_sample_clock_set_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 sample_rate)
+u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
+        return hpi_control_param_set(h_control,
                 HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, sample_rate, 0);
 }
 
-u16 hpi_sample_clock_get_local_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_sample_clock_get_local_rate(u32 h_control, u32 *psample_rate)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 sample_rate = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
+        err = hpi_control_param1_get(h_control,
                 HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, &sample_rate);
-        if (!error)
+        if (!err)
                 if (psample_rate)
                         *psample_rate = sample_rate;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_get_sample_rate(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *psample_rate)
+u16 hpi_sample_clock_get_sample_rate(u32 h_control, u32 *psample_rate)
 {
-        u16 error = 0;
+        u16 err = 0;
         u32 sample_rate = 0;
-        error = hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_SAMPLERATE, &sample_rate);
-        if (!error)
+        err = hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_SAMPLERATE,
+                &sample_rate);
+        if (!err)
                 if (psample_rate)
                         *psample_rate = sample_rate;
-        return error;
+        return err;
 }
 
-u16 hpi_sample_clock_set_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_sample_clock_set_auto(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_AUTO, enable, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_AUTO, enable,
+                0);
 }
 
-u16 hpi_sample_clock_get_auto(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *penable)
+u16 hpi_sample_clock_get_auto(u32 h_control, u32 *penable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_AUTO, penable);
+        return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_AUTO,
+                penable);
 }
 
-u16 hpi_sample_clock_set_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 lock)
+u16 hpi_sample_clock_set_local_rate_lock(u32 h_control, u32 lock)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_LOCAL_LOCK, lock, 0);
+        return hpi_control_param_set(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,
+                lock, 0);
 }
 
-u16 hpi_sample_clock_get_local_rate_lock(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *plock)
+u16 hpi_sample_clock_get_local_rate_lock(u32 h_control, u32 *plock)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SAMPLECLOCK_LOCAL_LOCK, plock);
+        return hpi_control_param1_get(h_control, HPI_SAMPLECLOCK_LOCAL_LOCK,
+                plock);
 }
 
-u16 hpi_tone_detector_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 index, u32 *frequency)
+u16 hpi_tone_detector_get_frequency(u32 h_control, u32 index, u32 *frequency)
 {
-        return hpi_control_param_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_FREQUENCY, index, 0, frequency, NULL);
+        return hpi_control_param_get(h_control, HPI_TONEDETECTOR_FREQUENCY,
+                index, 0, frequency, NULL);
 }
 
-u16 hpi_tone_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *state)
+u16 hpi_tone_detector_get_state(u32 h_control, u32 *state)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_STATE, state);
+        return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_STATE,
+                state);
 }
 
-u16 hpi_tone_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_tone_detector_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                (u32)enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_tone_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_tone_detector_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_tone_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 event_enable)
+u16 hpi_tone_detector_set_event_enable(u32 h_control, u32 event_enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, (u32)event_enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,
+                (u32)event_enable, 0);
 }
 
-u16 hpi_tone_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *event_enable)
+u16 hpi_tone_detector_get_event_enable(u32 h_control, u32 *event_enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable);
 }
 
-u16 hpi_tone_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int threshold)
+u16 hpi_tone_detector_set_threshold(u32 h_control, int threshold)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TONEDETECTOR_THRESHOLD, (u32)threshold, 0);
+        return hpi_control_param_set(h_control, HPI_TONEDETECTOR_THRESHOLD,
+                (u32)threshold, 0);
 }
 
-u16 hpi_tone_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int *threshold)
+u16 hpi_tone_detector_get_threshold(u32 h_control, int *threshold)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TONEDETECTOR_THRESHOLD, (u32 *)threshold);
+        return hpi_control_param1_get(h_control, HPI_TONEDETECTOR_THRESHOLD,
+                (u32 *)threshold);
 }
 
-u16 hpi_silence_detector_get_state(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *state)
+u16 hpi_silence_detector_get_state(u32 h_control, u32 *state)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_STATE, state);
+        return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_STATE,
+                state);
 }
 
-u16 hpi_silence_detector_set_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 enable)
+u16 hpi_silence_detector_set_enable(u32 h_control, u32 enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_GENERIC_ENABLE,
-                (u32)enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_ENABLE, enable,
+                0);
 }
 
-u16 hpi_silence_detector_get_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *enable)
+u16 hpi_silence_detector_get_enable(u32 h_control, u32 *enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_ENABLE, enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_ENABLE, enable);
 }
 
-u16 hpi_silence_detector_set_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 event_enable)
+u16 hpi_silence_detector_set_event_enable(u32 h_control, u32 event_enable)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable, 0);
+        return hpi_control_param_set(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable, 0);
 }
 
-u16 hpi_silence_detector_get_event_enable(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *event_enable)
+u16 hpi_silence_detector_get_event_enable(u32 h_control, u32 *event_enable)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_GENERIC_EVENT_ENABLE, event_enable);
+        return hpi_control_param1_get(h_control, HPI_GENERIC_EVENT_ENABLE,
+                event_enable);
 }
 
-u16 hpi_silence_detector_set_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 delay)
+u16 hpi_silence_detector_set_delay(u32 h_control, u32 delay)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_DELAY, delay, 0);
+        return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_DELAY,
+                delay, 0);
 }
 
-u16 hpi_silence_detector_get_delay(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *delay)
+u16 hpi_silence_detector_get_delay(u32 h_control, u32 *delay)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_DELAY, delay);
+        return hpi_control_param1_get(h_control, HPI_SILENCEDETECTOR_DELAY,
+                delay);
 }
 
-u16 hpi_silence_detector_set_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int threshold)
+u16 hpi_silence_detector_set_threshold(u32 h_control, int threshold)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_SILENCEDETECTOR_THRESHOLD, threshold, 0);
+        return hpi_control_param_set(h_control, HPI_SILENCEDETECTOR_THRESHOLD,
+                threshold, 0);
 }
 
-u16 hpi_silence_detector_get_threshold(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, int *threshold)
+u16 hpi_silence_detector_get_threshold(u32 h_control, int *threshold)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
+        return hpi_control_param1_get(h_control,
                 HPI_SILENCEDETECTOR_THRESHOLD, (u32 *)threshold);
 }
 
-u16 hpi_tuner_query_band(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_band)
+u16 hpi_tuner_query_band(const u32 h_tuner, const u32 index, u16 *pw_band)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,
-                &qr);
+        err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &qr);
         *pw_band = (u16)qr;
         return err;
 }
 
-u16 hpi_tuner_set_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 band)
+u16 hpi_tuner_set_band(u32 h_control, u16 band)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_BAND,
-                band, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_BAND, band, 0);
 }
 
-u16 hpi_tuner_get_band(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_band)
+u16 hpi_tuner_get_band(u32 h_control, u16 *pw_band)
 {
         u32 band = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_BAND,
-                &band);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_BAND, &band);
         if (pw_band)
                 *pw_band = (u16)band;
         return error;
 }
 
-u16 hpi_tuner_query_frequency(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pfreq)
+u16 hpi_tuner_query_frequency(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pfreq)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_FREQ, index,
-                band, pfreq);
+        return hpi_control_query(h_tuner, HPI_TUNER_FREQ, index, band, pfreq);
 }
 
-u16 hpi_tuner_set_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 freq_ink_hz)
+u16 hpi_tuner_set_frequency(u32 h_control, u32 freq_ink_hz)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_FREQ,
-                freq_ink_hz, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_FREQ, freq_ink_hz,
+                0);
 }
 
-u16 hpi_tuner_get_frequency(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pw_freq_ink_hz)
+u16 hpi_tuner_get_frequency(u32 h_control, u32 *pw_freq_ink_hz)
 {
-        return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_FREQ,
+        return hpi_control_param1_get(h_control, HPI_TUNER_FREQ,
                 pw_freq_ink_hz);
 }
 
-u16 hpi_tuner_query_gain(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, u16 *pw_gain)
+u16 hpi_tuner_query_gain(const u32 h_tuner, const u32 index, u16 *pw_gain)
 {
         u32 qr;
         u16 err;
 
-        err = hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_BAND, index, 0,
-                &qr);
+        err = hpi_control_query(h_tuner, HPI_TUNER_BAND, index, 0, &qr);
         *pw_gain = (u16)qr;
         return err;
 }
 
-u16 hpi_tuner_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short gain)
+u16 hpi_tuner_set_gain(u32 h_control, short gain)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_GAIN,
-                gain, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_GAIN, gain, 0);
 }
 
-u16 hpi_tuner_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pn_gain)
+u16 hpi_tuner_get_gain(u32 h_control, short *pn_gain)
 {
         u32 gain = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_GAIN,
-                &gain);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_GAIN, &gain);
         if (pn_gain)
                 *pn_gain = (u16)gain;
         return error;
 }
 
-u16 hpi_tuner_getRF_level(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *pw_level)
+u16 hpi_tuner_get_rf_level(u32 h_control, short *pw_level)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
-        hm.u.c.attribute = HPI_TUNER_LEVEL;
-        hm.u.c.param1 = HPI_TUNER_LEVEL_AVERAGE;
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+        hm.u.cu.attribute = HPI_TUNER_LEVEL_AVG;
         hpi_send_recv(&hm, &hr);
         if (pw_level)
-                *pw_level = (short)hr.u.c.param1;
+                *pw_level = hr.u.cu.tuner.s_level;
         return hr.error;
 }
 
-u16 hpi_tuner_get_rawRF_level(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short *pw_level)
+u16 hpi_tuner_get_raw_rf_level(u32 h_control, short *pw_level)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
-        hm.u.c.attribute = HPI_TUNER_LEVEL;
-        hm.u.c.param1 = HPI_TUNER_LEVEL_RAW;
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
+        hm.u.cu.attribute = HPI_TUNER_LEVEL_RAW;
         hpi_send_recv(&hm, &hr);
         if (pw_level)
-                *pw_level = (short)hr.u.c.param1;
+                *pw_level = hr.u.cu.tuner.s_level;
         return hr.error;
 }
 
-u16 hpi_tuner_query_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, const u32 index, const u16 band, u32 *pdeemphasis)
+u16 hpi_tuner_query_deemphasis(const u32 h_tuner, const u32 index,
+        const u16 band, u32 *pdeemphasis)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_DEEMPHASIS,
-                index, band, pdeemphasis);
+        return hpi_control_query(h_tuner, HPI_TUNER_DEEMPHASIS, index, band,
+                pdeemphasis);
 }
 
-u16 hpi_tuner_set_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 deemphasis)
+u16 hpi_tuner_set_deemphasis(u32 h_control, u32 deemphasis)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TUNER_DEEMPHASIS, deemphasis, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_DEEMPHASIS,
+                deemphasis, 0);
 }
 
-u16 hpi_tuner_get_deemphasis(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pdeemphasis)
+u16 hpi_tuner_get_deemphasis(u32 h_control, u32 *pdeemphasis)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TUNER_DEEMPHASIS, pdeemphasis);
+        return hpi_control_param1_get(h_control, HPI_TUNER_DEEMPHASIS,
+                pdeemphasis);
 }
 
-u16 hpi_tuner_query_program(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_tuner, u32 *pbitmap_program)
+u16 hpi_tuner_query_program(const u32 h_tuner, u32 *pbitmap_program)
 {
-        return hpi_control_query(ph_subsys, h_tuner, HPI_TUNER_PROGRAM, 0, 0,
+        return hpi_control_query(h_tuner, HPI_TUNER_PROGRAM, 0, 0,
                 pbitmap_program);
 }
 
-u16 hpi_tuner_set_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 program)
+u16 hpi_tuner_set_program(u32 h_control, u32 program)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_PROGRAM,
-                program, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_PROGRAM, program,
+                0);
 }
 
-u16 hpi_tuner_get_program(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *pprogram)
+u16 hpi_tuner_get_program(u32 h_control, u32 *pprogram)
 {
-        return hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_PROGRAM,
-                pprogram);
+        return hpi_control_param1_get(h_control, HPI_TUNER_PROGRAM, pprogram);
 }
 
-u16 hpi_tuner_get_hd_radio_dsp_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_dsp_version, const u32 string_size)
+u16 hpi_tuner_get_hd_radio_dsp_version(u32 h_control, char *psz_dsp_version,
+        const u32 string_size)
 {
         return hpi_control_get_string(h_control,
                 HPI_TUNER_HDRADIO_DSP_VERSION, psz_dsp_version, string_size);
 }
 
-u16 hpi_tuner_get_hd_radio_sdk_version(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_sdk_version, const u32 string_size)
+u16 hpi_tuner_get_hd_radio_sdk_version(u32 h_control, char *psz_sdk_version,
+        const u32 string_size)
 {
         return hpi_control_get_string(h_control,
                 HPI_TUNER_HDRADIO_SDK_VERSION, psz_sdk_version, string_size);
 }
 
-u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u16 *pw_status_mask, u16 *pw_status)
+u16 hpi_tuner_get_status(u32 h_control, u16 *pw_status_mask, u16 *pw_status)
 {
         u32 status = 0;
         u16 error = 0;
 
-        error = hpi_control_param1_get(ph_subsys, h_control, HPI_TUNER_STATUS,
-                &status);
+        error = hpi_control_param1_get(h_control, HPI_TUNER_STATUS, &status);
         if (pw_status) {
                 if (!error) {
                         *pw_status_mask = (u16)(status >> 16);
@@ -3005,50 +2685,44 @@ u16 hpi_tuner_get_status(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return error;
 }
 
-u16 hpi_tuner_set_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 value)
+u16 hpi_tuner_set_mode(u32 h_control, u32 mode, u32 value)
 {
-        return hpi_control_param_set(ph_subsys, h_control, HPI_TUNER_MODE,
-                mode, value);
+        return hpi_control_param_set(h_control, HPI_TUNER_MODE, mode, value);
 }
 
-u16 hpi_tuner_get_mode(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 mode, u32 *pn_value)
+u16 hpi_tuner_get_mode(u32 h_control, u32 mode, u32 *pn_value)
 {
-        return hpi_control_param_get(ph_subsys, h_control, HPI_TUNER_MODE,
-                mode, 0, pn_value, NULL);
+        return hpi_control_param_get(h_control, HPI_TUNER_MODE, mode, 0,
+                pn_value, NULL);
 }
 
-u16 hpi_tuner_get_hd_radio_signal_quality(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pquality)
+u16 hpi_tuner_get_hd_radio_signal_quality(u32 h_control, u32 *pquality)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
+        return hpi_control_param1_get(h_control,
                 HPI_TUNER_HDRADIO_SIGNAL_QUALITY, pquality);
 }
 
-u16 hpi_tuner_get_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *pblend)
+u16 hpi_tuner_get_hd_radio_signal_blend(u32 h_control, u32 *pblend)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_TUNER_HDRADIO_BLEND, pblend);
+        return hpi_control_param1_get(h_control, HPI_TUNER_HDRADIO_BLEND,
+                pblend);
 }
 
-u16 hpi_tuner_set_hd_radio_signal_blend(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, const u32 blend)
+u16 hpi_tuner_set_hd_radio_signal_blend(u32 h_control, const u32 blend)
 {
-        return hpi_control_param_set(ph_subsys, h_control,
-                HPI_TUNER_HDRADIO_BLEND, blend, 0);
+        return hpi_control_param_set(h_control, HPI_TUNER_HDRADIO_BLEND,
+                blend, 0);
 }
 
-u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *p_data)
+u16 hpi_tuner_get_rds(u32 h_control, char *p_data)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_TUNER_RDS;
         hpi_send_recv(&hm, &hr);
         if (p_data) {
@@ -3059,80 +2733,82 @@ u16 hpi_tuner_getRDS(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 HPI_PAD__get_channel_name(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, char *psz_string, const u32 data_length)
+u16 hpi_pad_get_channel_name(u32 h_control, char *psz_string,
+        const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_CHANNEL_NAME,
                 psz_string, data_length);
 }
 
-u16 HPI_PAD__get_artist(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_artist(u32 h_control, char *psz_string, const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_ARTIST, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_title(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_title(u32 h_control, char *psz_string, const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_TITLE, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_comment(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        char *psz_string, const u32 data_length)
+u16 hpi_pad_get_comment(u32 h_control, char *psz_string,
+        const u32 data_length)
 {
         return hpi_control_get_string(h_control, HPI_PAD_COMMENT, psz_string,
                 data_length);
 }
 
-u16 HPI_PAD__get_program_type(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, u32 *ppTY)
+u16 hpi_pad_get_program_type(u32 h_control, u32 *ppTY)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_PAD_PROGRAM_TYPE, ppTY);
+        return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_TYPE, ppTY);
 }
 
-u16 HPI_PAD__get_rdsPI(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        u32 *ppI)
+u16 hpi_pad_get_rdsPI(u32 h_control, u32 *ppI)
 {
-        return hpi_control_param1_get(ph_subsys, h_control,
-                HPI_PAD_PROGRAM_ID, ppI);
+        return hpi_control_param1_get(h_control, HPI_PAD_PROGRAM_ID, ppI);
 }
 
-u16 hpi_volume_query_channels(const struct hpi_hsubsys *ph_subsys,
-        const u32 h_volume, u32 *p_channels)
+u16 hpi_volume_query_channels(const u32 h_volume, u32 *p_channels)
 {
-        return hpi_control_query(ph_subsys, h_volume, HPI_VOLUME_NUM_CHANNELS,
-                0, 0, p_channels);
+        return hpi_control_query(h_volume, HPI_VOLUME_NUM_CHANNELS, 0, 0,
+                p_channels);
 }
 
-u16 hpi_volume_set_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_log_gain[HPI_MAX_CHANNELS]
+u16 hpi_volume_set_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]
         )
 {
         return hpi_control_log_set2(h_control, HPI_VOLUME_GAIN,
                 an_log_gain[0], an_log_gain[1]);
 }
 
-u16 hpi_volume_get_gain(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_log_gain[HPI_MAX_CHANNELS]
+u16 hpi_volume_get_gain(u32 h_control, short an_log_gain[HPI_MAX_CHANNELS]
         )
 {
-        return hpi_control_log_get2(ph_subsys, h_control, HPI_VOLUME_GAIN,
+        return hpi_control_log_get2(h_control, HPI_VOLUME_GAIN,
                 &an_log_gain[0], &an_log_gain[1]);
 }
 
-u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *min_gain_01dB, short *max_gain_01dB, short *step_gain_01dB)
+u16 hpi_volume_set_mute(u32 h_control, u32 mute)
+{
+        return hpi_control_param_set(h_control, HPI_VOLUME_MUTE, mute, 0);
+}
+
+u16 hpi_volume_get_mute(u32 h_control, u32 *mute)
+{
+        return hpi_control_param1_get(h_control, HPI_VOLUME_MUTE, mute);
+}
+
+u16 hpi_volume_query_range(u32 h_control, short *min_gain_01dB,
+        short *max_gain_01dB, short *step_gain_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOLUME_RANGE;
 
         hpi_send_recv(&hm, &hr);
@@ -3150,16 +2826,17 @@ u16 hpi_volume_query_range(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
-        u32 h_control, short an_stop_gain0_01dB[HPI_MAX_CHANNELS],
-        u32 duration_ms, u16 profile)
+u16 hpi_volume_auto_fade_profile(u32 h_control,
+        short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms,
+        u16 profile)
 {
         struct hpi_message hm;
         struct hpi_response hr;
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
 
         memcpy(hm.u.c.an_log_value, an_stop_gain0_01dB,
                 sizeof(short) * HPI_MAX_CHANNELS);
@@ -3173,21 +2850,21 @@ u16 hpi_volume_auto_fade_profile(const struct hpi_hsubsys *ph_subsys,
         return hr.error;
 }
 
-u16 hpi_volume_auto_fade(const struct hpi_hsubsys *ph_subsys, u32 h_control,
+u16 hpi_volume_auto_fade(u32 h_control,
         short an_stop_gain0_01dB[HPI_MAX_CHANNELS], u32 duration_ms)
 {
-        return hpi_volume_auto_fade_profile(ph_subsys, h_control,
-                an_stop_gain0_01dB, duration_ms, HPI_VOLUME_AUTOFADE_LOG);
+        return hpi_volume_auto_fade_profile(h_control, an_stop_gain0_01dB,
+                duration_ms, HPI_VOLUME_AUTOFADE_LOG);
 }
 
-u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short an_gain0_01dB)
+u16 hpi_vox_set_threshold(u32 h_control, short an_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOX_THRESHOLD;
 
         hm.u.c.an_log_value[0] = an_gain0_01dB;
@@ -3197,14 +2874,14 @@ u16 hpi_vox_set_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
         return hr.error;
 }
 
-u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
-        short *an_gain0_01dB)
+u16 hpi_vox_get_threshold(u32 h_control, short *an_gain0_01dB)
 {
         struct hpi_message hm;
         struct hpi_response hr;
         hpi_init_message_response(&hm, &hr, HPI_OBJ_CONTROL,
                 HPI_CONTROL_GET_STATE);
-        u32TOINDEXES(h_control, &hm.adapter_index, &hm.obj_index);
+        if (hpi_handle_indexes(h_control, &hm.adapter_index, &hm.obj_index))
+                return HPI_ERROR_INVALID_HANDLE;
         hm.u.c.attribute = HPI_VOX_THRESHOLD;
 
         hpi_send_recv(&hm, &hr);
@@ -3213,728 +2890,3 @@ u16 hpi_vox_get_threshold(const struct hpi_hsubsys *ph_subsys, u32 h_control,
 
         return hr.error;
 }
-
-static size_t strv_packet_size = MIN_STRV_PACKET_SIZE;
-
-static size_t entity_type_to_size[LAST_ENTITY_TYPE] = {
-        0,
-        sizeof(struct hpi_entity),
-        sizeof(void *),
-
-        sizeof(int),
-        sizeof(float),
-        sizeof(double),
-
-        sizeof(char),
-        sizeof(char),
-
-        4 * sizeof(char),
-        16 * sizeof(char),
-        6 * sizeof(char),
-};
-
-static inline size_t hpi_entity_size(struct hpi_entity *entity_ptr)
-{
-        return entity_ptr->header.size;
-}
-
-static inline size_t hpi_entity_header_size(struct hpi_entity *entity_ptr)
-{
-        return sizeof(entity_ptr->header);
-}
-
-static inline size_t hpi_entity_value_size(struct hpi_entity *entity_ptr)
-{
-        return hpi_entity_size(entity_ptr) -
-                hpi_entity_header_size(entity_ptr);
-}
-
-static inline size_t hpi_entity_item_count(struct hpi_entity *entity_ptr)
-{
-        return hpi_entity_value_size(entity_ptr) /
-                entity_type_to_size[entity_ptr->header.type];
-}
-
-static inline struct hpi_entity *hpi_entity_ptr_to_next(struct hpi_entity
-        *entity_ptr)
-{
-        return (void *)(((u8 *)entity_ptr) + hpi_entity_size(entity_ptr));
-}
-
-static inline u16 hpi_entity_check_type(const enum e_entity_type t)
-{
-        if (t >= 0 && t < STR_TYPE_FIELD_MAX)
-                return 0;
-        return HPI_ERROR_ENTITY_TYPE_INVALID;
-}
-
-static inline u16 hpi_entity_check_role(const enum e_entity_role r)
-{
-        if (r >= 0 && r < STR_ROLE_FIELD_MAX)
-                return 0;
-        return HPI_ERROR_ENTITY_ROLE_INVALID;
-}
-
-static u16 hpi_entity_get_next(struct hpi_entity *entity, int recursive_flag,
-        void *guard_p, struct hpi_entity **next)
-{
-        HPI_DEBUG_ASSERT(entity != NULL);
-        HPI_DEBUG_ASSERT(next != NULL);
-        HPI_DEBUG_ASSERT(hpi_entity_size(entity) != 0);
-
-        if (guard_p <= (void *)entity) {
-                *next = NULL;
-                return 0;
-        }
-
-        if (recursive_flag && entity->header.type == entity_type_sequence)
-                *next = (struct hpi_entity *)entity->value;
-        else
-                *next = (struct hpi_entity *)hpi_entity_ptr_to_next(entity);
-
-        if (guard_p <= (void *)*next) {
-                *next = NULL;
-                return 0;
-        }
-
-        HPI_DEBUG_ASSERT(guard_p >= (void *)hpi_entity_ptr_to_next(*next));
-        return 0;
-}
-
-u16 hpi_entity_find_next(struct hpi_entity *container_entity,
-        enum e_entity_type type, enum e_entity_role role, int recursive_flag,
-        struct hpi_entity **current_match)
-{
-        struct hpi_entity *tmp = NULL;
-        void *guard_p = NULL;
-
-        HPI_DEBUG_ASSERT(container_entity != NULL);
-        guard_p = hpi_entity_ptr_to_next(container_entity);
-
-        if (*current_match != NULL)
-                hpi_entity_get_next(*current_match, recursive_flag, guard_p,
-                        &tmp);
-        else
-                hpi_entity_get_next(container_entity, 1, guard_p, &tmp);
-
-        while (tmp) {
-                u16 err;
-
-                HPI_DEBUG_ASSERT((void *)tmp >= (void *)container_entity);
-
-                if ((!type || tmp->header.type == type) && (!role
-                                || tmp->header.role == role)) {
-                        *current_match = tmp;
-                        return 0;
-                }
-
-                err = hpi_entity_get_next(tmp, recursive_flag, guard_p,
-                        current_match);
-                if (err)
-                        return err;
-
-                tmp = *current_match;
-        }
-
-        *current_match = NULL;
-        return 0;
-}
-
-void hpi_entity_free(struct hpi_entity *entity)
-{
-        kfree(entity);
-}
-
-static u16 hpi_entity_alloc_and_copy(struct hpi_entity *src,
-        struct hpi_entity **dst)
-{
-        size_t buf_size;
-        HPI_DEBUG_ASSERT(dst != NULL);
-        HPI_DEBUG_ASSERT(src != NULL);
-
-        buf_size = hpi_entity_size(src);
-        *dst = kmalloc(buf_size, GFP_KERNEL);
-        if (*dst == NULL)
-                return HPI_ERROR_MEMORY_ALLOC;
-        memcpy(*dst, src, buf_size);
-        return 0;
-}
-
-u16 hpi_universal_info(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **info)
-{
-        struct hpi_msg_strv hm;
-        struct hpi_res_strv *phr;
-        u16 hpi_err;
-        int remaining_attempts = 2;
-        size_t resp_packet_size = 1024;
-
-        *info = NULL;
-
-        while (remaining_attempts--) {
-                phr = kmalloc(resp_packet_size, GFP_KERNEL);
-                HPI_DEBUG_ASSERT(phr != NULL);
-
-                hpi_init_message_responseV1(&hm.h, (u16)sizeof(hm), &phr->h,
-                        (u16)resp_packet_size, HPI_OBJ_CONTROL,
-                        HPI_CONTROL_GET_INFO);
-                u32TOINDEXES(hC, &hm.h.adapter_index, &hm.h.obj_index);
-
-                hm.strv.header.size = sizeof(hm.strv);
-                phr->strv.header.size = resp_packet_size - sizeof(phr->h);
-
-                hpi_send_recv((struct hpi_message *)&hm.h,
-                        (struct hpi_response *)&phr->h);
-                if (phr->h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {
-
-                        HPI_DEBUG_ASSERT(phr->h.specific_error >
-                                MIN_STRV_PACKET_SIZE
-                                && phr->h.specific_error < 1500);
-                        resp_packet_size = phr->h.specific_error;
-                } else {
-                        remaining_attempts = 0;
-                        if (!phr->h.error)
-                                hpi_entity_alloc_and_copy(&phr->strv, info);
-                }
-
-                hpi_err = phr->h.error;
-                kfree(phr);
-        }
-
-        return hpi_err;
-}
-
-u16 hpi_universal_get(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity **value)
-{
-        struct hpi_msg_strv hm;
-        struct hpi_res_strv *phr;
-        u16 hpi_err;
-        int remaining_attempts = 2;
-
-        *value = NULL;
-
-        while (remaining_attempts--) {
-                phr = kmalloc(strv_packet_size, GFP_KERNEL);
-                if (!phr)
-                        return HPI_ERROR_MEMORY_ALLOC;
-
-                hpi_init_message_responseV1(&hm.h, (u16)sizeof(hm), &phr->h,
-                        (u16)strv_packet_size, HPI_OBJ_CONTROL,
-                        HPI_CONTROL_GET_STATE);
-                u32TOINDEXES(hC, &hm.h.adapter_index, &hm.h.obj_index);
-
-                hm.strv.header.size = sizeof(hm.strv);
-                phr->strv.header.size = strv_packet_size - sizeof(phr->h);
-
-                hpi_send_recv((struct hpi_message *)&hm.h,
-                        (struct hpi_response *)&phr->h);
-                if (phr->h.error == HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL) {
-
-                        HPI_DEBUG_ASSERT(phr->h.specific_error >
-                                MIN_STRV_PACKET_SIZE
-                                && phr->h.specific_error < 1000);
-                        strv_packet_size = phr->h.specific_error;
-                } else {
-                        remaining_attempts = 0;
-                        if (!phr->h.error)
-                                hpi_entity_alloc_and_copy(&phr->strv, value);
-                }
-
-                hpi_err = phr->h.error;
-                kfree(phr);
-        }
-
-        return hpi_err;
-}
-
-u16 hpi_universal_set(const struct hpi_hsubsys *ph_subsys, u32 hC,
-        struct hpi_entity *value)
-{
-        struct hpi_msg_strv *phm;
-        struct hpi_res_strv hr;
-
-        phm = kmalloc(sizeof(phm->h) + value->header.size, GFP_KERNEL);
-        HPI_DEBUG_ASSERT(phm != NULL);
-
-        hpi_init_message_responseV1(&phm->h,
-                sizeof(phm->h) + value->header.size, &hr.h, sizeof(hr),
-                HPI_OBJ_CONTROL, HPI_CONTROL_SET_STATE);
-        u32TOINDEXES(hC, &phm->h.adapter_index, &phm->h.obj_index);
-        hr.strv.header.size = sizeof(hr.strv);
-
-        memcpy(&phm->strv, value, value->header.size);
-        hpi_send_recv((struct hpi_message *)&phm->h,
-                (struct hpi_response *)&hr.h);
-
-        return hr.h.error;
-}
-
-u16 hpi_entity_alloc_and_pack(const enum e_entity_type type,
-        const size_t item_count, const enum e_entity_role role, void *value,
-        struct hpi_entity **entity)
-{
-        size_t bytes_to_copy, total_size;
-        u16 hE = 0;
-        *entity = NULL;
-
-        hE = hpi_entity_check_type(type);
-        if (hE)
-                return hE;
-
-        HPI_DEBUG_ASSERT(role > entity_role_null && type < LAST_ENTITY_TYPE);
-
-        bytes_to_copy = entity_type_to_size[type] * item_count;
-        total_size = hpi_entity_header_size(*entity) + bytes_to_copy;
-
-        HPI_DEBUG_ASSERT(total_size >= hpi_entity_header_size(*entity)
-                && total_size < STR_SIZE_FIELD_MAX);
-
-        *entity = kmalloc(total_size, GFP_KERNEL);
-        if (*entity == NULL)
-                return HPI_ERROR_MEMORY_ALLOC;
-        memcpy((*entity)->value, value, bytes_to_copy);
-        (*entity)->header.size =
-                hpi_entity_header_size(*entity) + bytes_to_copy;
-        (*entity)->header.type = type;
-        (*entity)->header.role = role;
-        return 0;
-}
-
-u16 hpi_entity_copy_value_from(struct hpi_entity *entity,
-        enum e_entity_type type, size_t item_count, void *value_dst_p)
-{
-        size_t bytes_to_copy;
-
-        if (entity->header.type != type)
-                return HPI_ERROR_ENTITY_TYPE_MISMATCH;
-
-        if (hpi_entity_item_count(entity) != item_count)
-                return HPI_ERROR_ENTITY_ITEM_COUNT;
-
-        bytes_to_copy = entity_type_to_size[type] * item_count;
-        memcpy(value_dst_p, entity->value, bytes_to_copy);
-        return 0;
-}
-
-u16 hpi_entity_unpack(struct hpi_entity *entity, enum e_entity_type *type,
-        size_t *item_count, enum e_entity_role *role, void **value)
-{
-        u16 err = 0;
-        HPI_DEBUG_ASSERT(entity != NULL);
-
-        if (type)
-                *type = entity->header.type;
-
-        if (role)
-                *role = entity->header.role;
-
-        if (value)
-                *value = entity->value;
-
-        if (item_count != NULL) {
-                if (entity->header.type == entity_type_sequence) {
-                        void *guard_p = hpi_entity_ptr_to_next(entity);
-                        struct hpi_entity *next = NULL;
-                        void *contents = entity->value;
-
-                        *item_count = 0;
-                        while (contents < guard_p) {
-                                (*item_count)++;
-                                err = hpi_entity_get_next(contents, 0,
-                                        guard_p, &next);
-                                if (next == NULL || err)
-                                        break;
-                                contents = next;
-                        }
-                } else {
-                        *item_count = hpi_entity_item_count(entity);
-                }
-        }
-        return err;
-}
-
-u16 hpi_gpio_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_gpio, u16 *pw_number_input_bits, u16 *pw_number_output_bits)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0) {
-                *ph_gpio =
-                        hpi_indexes_to_handle(HPI_OBJ_GPIO, adapter_index, 0);
-                if (pw_number_input_bits)
-                        *pw_number_input_bits = hr.u.l.number_input_bits;
-                if (pw_number_output_bits)
-                        *pw_number_output_bits = hr.u.l.number_output_bits;
-        } else
-                *ph_gpio = 0;
-        return hr.error;
-}
-
-u16 hpi_gpio_read_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 *pw_bit_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_READ_BIT);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-        hm.u.l.bit_index = bit_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *pw_bit_data = hr.u.l.bit_data[0];
-        return hr.error;
-}
-
-u16 hpi_gpio_read_all_bits(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        )
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_READ_ALL);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (aw_all_bit_data) {
-                aw_all_bit_data[0] = hr.u.l.bit_data[0];
-                aw_all_bit_data[1] = hr.u.l.bit_data[1];
-                aw_all_bit_data[2] = hr.u.l.bit_data[2];
-                aw_all_bit_data[3] = hr.u.l.bit_data[3];
-        }
-        return hr.error;
-}
-
-u16 hpi_gpio_write_bit(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 bit_index, u16 bit_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO, HPI_GPIO_WRITE_BIT);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-        hm.u.l.bit_index = bit_index;
-        hm.u.l.bit_data = bit_data;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_gpio_write_status(const struct hpi_hsubsys *ph_subsys, u32 h_gpio,
-        u16 aw_all_bit_data[4]
-        )
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_GPIO,
-                HPI_GPIO_WRITE_STATUS);
-        u32TOINDEX(h_gpio, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (aw_all_bit_data) {
-                aw_all_bit_data[0] = hr.u.l.bit_data[0];
-                aw_all_bit_data[1] = hr.u.l.bit_data[1];
-                aw_all_bit_data[2] = hr.u.l.bit_data[2];
-                aw_all_bit_data[3] = hr.u.l.bit_data[3];
-        }
-        return hr.error;
-}
-
-u16 hpi_async_event_open(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u32 *ph_async)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-
-                *ph_async =
-                        hpi_indexes_to_handle(HPI_OBJ_ASYNCEVENT,
-                        adapter_index, 0);
-        else
-                *ph_async = 0;
-        return hr.error;
-
-}
-
-u16 hpi_async_event_close(const struct hpi_hsubsys *ph_subsys, u32 h_async)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_OPEN);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned)
-{
-
-        return 0;
-}
-
-u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys,
-        u32 h_async, u16 *pw_count)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_GETCOUNT);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-                if (pw_count)
-                        *pw_count = hr.u.as.u.count.count;
-
-        return hr.error;
-}
-
-u16 hpi_async_event_get(const struct hpi_hsubsys *ph_subsys, u32 h_async,
-        u16 maximum_events, struct hpi_async_event *p_events,
-        u16 *pw_number_returned)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_ASYNCEVENT,
-                HPI_ASYNCEVENT_GET);
-        u32TOINDEX(h_async, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-        if (!hr.error) {
-                memcpy(p_events, &hr.u.as.u.event,
-                        sizeof(struct hpi_async_event));
-                *pw_number_returned = 1;
-        }
-
-        return hr.error;
-}
-
-u16 hpi_nv_memory_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_nv_memory, u16 *pw_size_in_bytes)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0) {
-                *ph_nv_memory =
-                        hpi_indexes_to_handle(HPI_OBJ_NVMEMORY, adapter_index,
-                        0);
-                if (pw_size_in_bytes)
-                        *pw_size_in_bytes = hr.u.n.size_in_bytes;
-        } else
-                *ph_nv_memory = 0;
-        return hr.error;
-}
-
-u16 hpi_nv_memory_read_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 *pw_data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_READ_BYTE);
-        u32TOINDEX(h_nv_memory, &hm.adapter_index);
-        hm.u.n.address = index;
-
-        hpi_send_recv(&hm, &hr);
-
-        *pw_data = hr.u.n.data;
-        return hr.error;
-}
-
-u16 hpi_nv_memory_write_byte(const struct hpi_hsubsys *ph_subsys,
-        u32 h_nv_memory, u16 index, u16 data)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_NVMEMORY,
-                HPI_NVMEMORY_WRITE_BYTE);
-        u32TOINDEX(h_nv_memory, &hm.adapter_index);
-        hm.u.n.address = index;
-        hm.u.n.data = data;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_profile_open_all(const struct hpi_hsubsys *ph_subsys,
-        u16 adapter_index, u16 profile_index, u32 *ph_profile,
-        u16 *pw_max_profiles)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_OPEN_ALL);
-        hm.adapter_index = adapter_index;
-        hm.obj_index = profile_index;
-        hpi_send_recv(&hm, &hr);
-
-        *pw_max_profiles = hr.u.p.u.o.max_profiles;
-        if (hr.error == 0)
-                *ph_profile =
-                        hpi_indexes_to_handle(HPI_OBJ_PROFILE, adapter_index,
-                        profile_index);
-        else
-                *ph_profile = 0;
-        return hr.error;
-}
-
-u16 hpi_profile_get(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 bin_index, u16 *pw_seconds, u32 *pmicro_seconds, u32 *pcall_count,
-        u32 *pmax_micro_seconds, u32 *pmin_micro_seconds)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE, HPI_PROFILE_GET);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hm.u.p.bin_index = bin_index;
-        hpi_send_recv(&hm, &hr);
-        if (pw_seconds)
-                *pw_seconds = hr.u.p.u.t.seconds;
-        if (pmicro_seconds)
-                *pmicro_seconds = hr.u.p.u.t.micro_seconds;
-        if (pcall_count)
-                *pcall_count = hr.u.p.u.t.call_count;
-        if (pmax_micro_seconds)
-                *pmax_micro_seconds = hr.u.p.u.t.max_micro_seconds;
-        if (pmin_micro_seconds)
-                *pmin_micro_seconds = hr.u.p.u.t.min_micro_seconds;
-        return hr.error;
-}
-
-u16 hpi_profile_get_utilization(const struct hpi_hsubsys *ph_subsys,
-        u32 h_profile, u32 *putilization)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_GET_UTILIZATION);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-        if (hr.error) {
-                if (putilization)
-                        *putilization = 0;
-        } else {
-                if (putilization)
-                        *putilization = hr.u.p.u.t.call_count;
-        }
-        return hr.error;
-}
-
-u16 hpi_profile_get_name(const struct hpi_hsubsys *ph_subsys, u32 h_profile,
-        u16 bin_index, char *sz_name, u16 name_length)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_GET_NAME);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hm.u.p.bin_index = bin_index;
-        hpi_send_recv(&hm, &hr);
-        if (hr.error) {
-                if (sz_name)
-                        strcpy(sz_name, "??");
-        } else {
-                if (sz_name)
-                        memcpy(sz_name, (char *)hr.u.p.u.n.sz_name,
-                                name_length);
-        }
-        return hr.error;
-}
-
-u16 hpi_profile_start_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_START_ALL);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_profile_stop_all(const struct hpi_hsubsys *ph_subsys, u32 h_profile)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_PROFILE,
-                HPI_PROFILE_STOP_ALL);
-        u32TOINDEXES(h_profile, &hm.adapter_index, &hm.obj_index);
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_watchdog_open(const struct hpi_hsubsys *ph_subsys, u16 adapter_index,
-        u32 *ph_watchdog)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_OPEN);
-        hm.adapter_index = adapter_index;
-
-        hpi_send_recv(&hm, &hr);
-
-        if (hr.error == 0)
-                *ph_watchdog =
-                        hpi_indexes_to_handle(HPI_OBJ_WATCHDOG, adapter_index,
-                        0);
-        else
-                *ph_watchdog = 0;
-        return hr.error;
-}
-
-u16 hpi_watchdog_set_time(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog,
-        u32 time_millisec)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_SET_TIME);
-        u32TOINDEX(h_watchdog, &hm.adapter_index);
-        hm.u.w.time_ms = time_millisec;
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
-
-u16 hpi_watchdog_ping(const struct hpi_hsubsys *ph_subsys, u32 h_watchdog)
-{
-        struct hpi_message hm;
-        struct hpi_response hr;
-        hpi_init_message_response(&hm, &hr, HPI_OBJ_WATCHDOG,
-                HPI_WATCHDOG_PING);
-        u32TOINDEX(h_watchdog, &hm.adapter_index);
-
-        hpi_send_recv(&hm, &hr);
-
-        return hr.error;
-}
diff --git a/sound/pci/asihpi/hpimsginit.c b/sound/pci/asihpi/hpimsginit.c
index 8e1d099ed7e4..628376ce4a49 100644
--- a/sound/pci/asihpi/hpimsginit.c
+++ b/sound/pci/asihpi/hpimsginit.c
@@ -32,21 +32,6 @@ static u16 res_size[HPI_OBJ_MAXINDEX + 1] = HPI_RESPONSE_SIZE_BY_OBJECT;
 static u16 gwSSX2_bypass;
 
 /** \internal
-  * Used by ASIO driver to disable SSX2 for a single process
-  * \param phSubSys Pointer to HPI subsystem handle.
-  * \param wBypass New bypass setting 0 = off, nonzero = on
-  * \return Previous bypass setting.
-  */
-u16 hpi_subsys_ssx2_bypass(const struct hpi_hsubsys *ph_subsys, u16 bypass)
-{
-        u16 old_value = gwSSX2_bypass;
-
-        gwSSX2_bypass = bypass;
-
-        return old_value;
-}
-
-/** \internal
   * initialize the HPI message structure
   */
 static void hpi_init_message(struct hpi_message *phm, u16 object,
@@ -65,7 +50,8 @@ static void hpi_init_message(struct hpi_message *phm, u16 object,
         phm->object = object;
         phm->function = function;
         phm->version = 0;
-        /* Expect adapter index to be set by caller */
+        phm->adapter_index = HPI_ADAPTER_INDEX_INVALID;
+        /* Expect actual adapter index to be set by caller */
 }
 
 /** \internal
diff --git a/sound/pci/asihpi/hpimsginit.h b/sound/pci/asihpi/hpimsginit.h
index 864ad020c9b3..bfd330d78b58 100644
--- a/sound/pci/asihpi/hpimsginit.h
+++ b/sound/pci/asihpi/hpimsginit.h
@@ -21,11 +21,15 @@
  (C) Copyright AudioScience Inc. 2007
 *******************************************************************************/
 /* Initialise response headers, or msg/response pairs.
-Note that it is valid to just init a response e.g. when a lower level is preparing
-a response to a message.
-However, when sending a message, a matching response buffer always must be prepared
+Note that it is valid to just init a response e.g. when a lower level is
+preparing a response to a message.
+However, when sending a message, a matching response buffer must always be
+prepared.
 */
 
+#ifndef _HPIMSGINIT_H_
+#define _HPIMSGINIT_H_
+
 void hpi_init_response(struct hpi_response *phr, u16 object, u16 function,
         u16 error);
 
@@ -38,3 +42,5 @@ void hpi_init_responseV1(struct hpi_response_header *phr, u16 size,
 void hpi_init_message_responseV1(struct hpi_message_header *phm, u16 msg_size,
         struct hpi_response_header *phr, u16 res_size, u16 object,
         u16 function);
+
+#endif                          /* _HPIMSGINIT_H_ */
diff --git a/sound/pci/asihpi/hpimsgx.c b/sound/pci/asihpi/hpimsgx.c
index f01ab964f602..bcbdf30a6aa0 100644
--- a/sound/pci/asihpi/hpimsgx.c
+++ b/sound/pci/asihpi/hpimsgx.c
@@ -23,6 +23,7 @@ Extended Message Function With Response Cacheing
 #define SOURCEFILE_NAME "hpimsgx.c"
 #include "hpi_internal.h"
 #include "hpimsginit.h"
+#include "hpicmn.h"
 #include "hpimsgx.h"
 #include "hpidebug.h"
 
@@ -42,22 +43,24 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci
 
         for (i = 0; asihpi_pci_tbl[i].vendor != 0; i++) {
                 if (asihpi_pci_tbl[i].vendor != PCI_ANY_ID
-                        && asihpi_pci_tbl[i].vendor != pci_info->vendor_id)
+                        && asihpi_pci_tbl[i].vendor !=
+                        pci_info->pci_dev->vendor)
                         continue;
                 if (asihpi_pci_tbl[i].device != PCI_ANY_ID
-                        && asihpi_pci_tbl[i].device != pci_info->device_id)
+                        && asihpi_pci_tbl[i].device !=
+                        pci_info->pci_dev->device)
                         continue;
                 if (asihpi_pci_tbl[i].subvendor != PCI_ANY_ID
                         && asihpi_pci_tbl[i].subvendor !=
-                        pci_info->subsys_vendor_id)
+                        pci_info->pci_dev->subsystem_vendor)
                         continue;
                 if (asihpi_pci_tbl[i].subdevice != PCI_ANY_ID
                         && asihpi_pci_tbl[i].subdevice !=
-                        pci_info->subsys_device_id)
+                        pci_info->pci_dev->subsystem_device)
                         continue;
 
-                HPI_DEBUG_LOG(DEBUG, " %x,%lu\n", i,
-                        asihpi_pci_tbl[i].driver_data);
+                /* HPI_DEBUG_LOG(DEBUG, " %x,%lx\n", i,
+                   asihpi_pci_tbl[i].driver_data); */
                 return (hpi_handler_func *) asihpi_pci_tbl[i].driver_data;
         }
 
@@ -67,21 +70,12 @@ static hpi_handler_func *hpi_lookup_entry_point_function(const struct hpi_pci
 static inline void hw_entry_point(struct hpi_message *phm,
         struct hpi_response *phr)
 {
-
-        hpi_handler_func *ep;
-
-        if (phm->adapter_index < HPI_MAX_ADAPTERS) {
-                ep = (hpi_handler_func *) hpi_entry_points[phm->
-                        adapter_index];
-                if (ep) {
-                        HPI_DEBUG_MESSAGE(DEBUG, phm);
-                        ep(phm, phr);
-                        HPI_DEBUG_RESPONSE(phr);
-                        return;
-                }
-        }
-        hpi_init_response(phr, phm->object, phm->function,
-                HPI_ERROR_PROCESSING_MESSAGE);
+        if ((phm->adapter_index < HPI_MAX_ADAPTERS)
+                && hpi_entry_points[phm->adapter_index])
+                hpi_entry_points[phm->adapter_index] (phm, phr);
+        else
+                hpi_init_response(phr, phm->object, phm->function,
+                        HPI_ERROR_PROCESSING_MESSAGE);
 }
 
 static void adapter_open(struct hpi_message *phm, struct hpi_response *phr);
@@ -100,6 +94,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
         void *h_owner);
 
 static void HPIMSGX__reset(u16 adapter_index);
+
 static u16 HPIMSGX__init(struct hpi_message *phm, struct hpi_response *phr);
 static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner);
 
@@ -153,8 +148,6 @@ static struct hpi_stream_response
 
 static struct hpi_mixer_response rESP_HPI_MIXER_OPEN[HPI_MAX_ADAPTERS];
 
-static struct hpi_subsys_response gRESP_HPI_SUBSYS_FIND_ADAPTERS;
-
 static struct adapter_info aDAPTER_INFO[HPI_MAX_ADAPTERS];
 
 /* use these to keep track of opens from user mode apps/DLLs */
@@ -167,6 +160,11 @@ static struct asi_open_state
 static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,
         void *h_owner)
 {
+        if (phm->adapter_index != HPI_ADAPTER_INDEX_INVALID)
+                HPI_DEBUG_LOG(WARNING,
+                        "suspicious adapter index %d in subsys message 0x%x.\n",
+                        phm->adapter_index, phm->function);
+
         switch (phm->function) {
         case HPI_SUBSYS_GET_VERSION:
                 hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
@@ -204,85 +202,37 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr,
                         HPI_SUBSYS_DRIVER_UNLOAD, 0);
                 return;
 
-        case HPI_SUBSYS_GET_INFO:
-                HPI_COMMON(phm, phr);
-                break;
-
-        case HPI_SUBSYS_FIND_ADAPTERS:
-                memcpy(phr, &gRESP_HPI_SUBSYS_FIND_ADAPTERS,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-                break;
         case HPI_SUBSYS_GET_NUM_ADAPTERS:
-                memcpy(phr, &gRESP_HPI_SUBSYS_FIND_ADAPTERS,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-                phr->function = HPI_SUBSYS_GET_NUM_ADAPTERS;
-                break;
         case HPI_SUBSYS_GET_ADAPTER:
-                {
-                        int count = phm->adapter_index;
-                        int index = 0;
-                        hpi_init_response(phr, HPI_OBJ_SUBSYSTEM,
-                                HPI_SUBSYS_GET_ADAPTER, 0);
-
-                        /* This is complicated by the fact that we want to
-                         * "skip" 0's in the adapter list.
-                         * First, make sure we are pointing to a
-                         * non-zero adapter type.
-                         */
-                        while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                s.aw_adapter_list[index] == 0) {
-                                index++;
-                                if (index >= HPI_MAX_ADAPTERS)
-                                        break;
-                        }
-                        while (count) {
-                                /* move on to the next adapter */
-                                index++;
-                                if (index >= HPI_MAX_ADAPTERS)
-                                        break;
-                                while (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                        s.aw_adapter_list[index] == 0) {
-                                        index++;
-                                        if (index >= HPI_MAX_ADAPTERS)
-                                                break;
-                                }
-                                count--;
-                        }
+                HPI_COMMON(phm, phr);
+                break;
 
-                        if (index < HPI_MAX_ADAPTERS) {
-                                phr->u.s.adapter_index = (u16)index;
-                                phr->u.s.aw_adapter_list[0] =
-                                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                        s.aw_adapter_list[index];
-                        } else {
-                                phr->u.s.adapter_index = 0;
-                                phr->u.s.aw_adapter_list[0] = 0;
-                                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
-                        }
-                        break;
-                }
         case HPI_SUBSYS_CREATE_ADAPTER:
                 HPIMSGX__init(phm, phr);
                 break;
+
         case HPI_SUBSYS_DELETE_ADAPTER:
-                HPIMSGX__cleanup(phm->adapter_index, h_owner);
+                HPIMSGX__cleanup(phm->obj_index, h_owner);
                 {
                         struct hpi_message hm;
                         struct hpi_response hr;
-                        /* call to HPI_ADAPTER_CLOSE */
                         hpi_init_message_response(&hm, &hr, HPI_OBJ_ADAPTER,
                                 HPI_ADAPTER_CLOSE);
-                        hm.adapter_index = phm->adapter_index;
+                        hm.adapter_index = phm->obj_index;
                         hw_entry_point(&hm, &hr);
                 }
-                hw_entry_point(phm, phr);
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.
-                        aw_adapter_list[phm->adapter_index]
-                        = 0;
-                hpi_entry_points[phm->adapter_index] = NULL;
+                if ((phm->obj_index < HPI_MAX_ADAPTERS)
+                        && hpi_entry_points[phm->obj_index]) {
+                        hpi_entry_points[phm->obj_index] (phm, phr);
+                        hpi_entry_points[phm->obj_index] = NULL;
+                } else
+                        phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
+
                 break;
         default:
-                hw_entry_point(phm, phr);
+                /* Must explicitly handle every subsys message in this switch */
+                hpi_init_response(phr, HPI_OBJ_SUBSYSTEM, phm->function,
+                        HPI_ERROR_INVALID_FUNC);
                 break;
         }
 }
@@ -409,33 +359,7 @@ void hpi_send_recv_ex(struct hpi_message *phm, struct hpi_response *phr,
                 break;
         }
         HPI_DEBUG_RESPONSE(phr);
-#if 1
-        if (phr->error >= HPI_ERROR_BACKEND_BASE) {
-                void *ep = NULL;
-                char *ep_name;
-
-                HPI_DEBUG_MESSAGE(ERROR, phm);
-
-                if (phm->adapter_index < HPI_MAX_ADAPTERS)
-                        ep = hpi_entry_points[phm->adapter_index];
-
-                /* Don't need this? Have adapter index in debug info
-                   Know at driver load time index->backend mapping */
-                if (ep == HPI_6000)
-                        ep_name = "HPI_6000";
-                else if (ep == HPI_6205)
-                        ep_name = "HPI_6205";
-                else
-                        ep_name = "unknown";
-
-                HPI_DEBUG_LOG(ERROR, "HPI %s response - error# %d\n", ep_name,
-                        phr->error);
-
-                if (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)
-                        hpi_debug_data((u16 *)phm,
-                                sizeof(*phm) / sizeof(u16));
-        }
-#endif
+
 }
 
 static void adapter_open(struct hpi_message *phm, struct hpi_response *phr)
@@ -484,7 +408,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,
         else {
                 instream_user_open[phm->adapter_index][phm->
                         obj_index].open_flag = 1;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
 
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
@@ -509,7 +433,7 @@ static void instream_open(struct hpi_message *phm, struct hpi_response *phr,
                                 sizeof(rESP_HPI_ISTREAM_OPEN[0][0]));
                 }
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
@@ -530,7 +454,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
                    phm->wAdapterIndex, phm->wObjIndex, hOwner); */
                 instream_user_open[phm->adapter_index][phm->
                         obj_index].h_owner = NULL;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_ISTREAM,
                         HPI_ISTREAM_RESET);
@@ -556,7 +480,7 @@ static void instream_close(struct hpi_message *phm, struct hpi_response *phr,
                                 obj_index].h_owner);
                 phr->error = HPI_ERROR_OBJ_NOT_OPEN;
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
@@ -581,7 +505,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
         else {
                 outstream_user_open[phm->adapter_index][phm->
                         obj_index].open_flag = 1;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
 
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
@@ -606,7 +530,7 @@ static void outstream_open(struct hpi_message *phm, struct hpi_response *phr,
                                 sizeof(rESP_HPI_OSTREAM_OPEN[0][0]));
                 }
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
@@ -628,7 +552,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
                    phm->wAdapterIndex, phm->wObjIndex, hOwner); */
                 outstream_user_open[phm->adapter_index][phm->
                         obj_index].h_owner = NULL;
-                hpios_msgxlock_un_lock(&msgx_lock);
+                hpios_msgxlock_unlock(&msgx_lock);
                 /* issue a reset */
                 hpi_init_message_response(&hm, &hr, HPI_OBJ_OSTREAM,
                         HPI_OSTREAM_RESET);
@@ -654,7 +578,7 @@ static void outstream_close(struct hpi_message *phm, struct hpi_response *phr,
                                 obj_index].h_owner);
                 phr->error = HPI_ERROR_OBJ_NOT_OPEN;
         }
-        hpios_msgxlock_un_lock(&msgx_lock);
+        hpios_msgxlock_unlock(&msgx_lock);
 }
 
 static u16 adapter_prepare(u16 adapter)
@@ -683,16 +607,9 @@ static u16 adapter_prepare(u16 adapter)
         if (hr.error)
                 return hr.error;
 
-        aDAPTER_INFO[adapter].num_outstreams = hr.u.a.num_outstreams;
-        aDAPTER_INFO[adapter].num_instreams = hr.u.a.num_instreams;
-        aDAPTER_INFO[adapter].type = hr.u.a.adapter_type;
-
-        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list[adapter] =
-                hr.u.a.adapter_type;
-        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters++;
-        if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters > HPI_MAX_ADAPTERS)
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters =
-                        HPI_MAX_ADAPTERS;
+        aDAPTER_INFO[adapter].num_outstreams = hr.u.ax.info.num_outstreams;
+        aDAPTER_INFO[adapter].num_instreams = hr.u.ax.info.num_instreams;
+        aDAPTER_INFO[adapter].type = hr.u.ax.info.adapter_type;
 
         /* call to HPI_OSTREAM_OPEN */
         for (i = 0; i < aDAPTER_INFO[adapter].num_outstreams; i++) {
@@ -727,7 +644,7 @@ static u16 adapter_prepare(u16 adapter)
         memcpy(&rESP_HPI_MIXER_OPEN[adapter], &hr,
                 sizeof(rESP_HPI_MIXER_OPEN[0]));
 
-        return gRESP_HPI_SUBSYS_FIND_ADAPTERS.h.error;
+        return 0;
 }
 
 static void HPIMSGX__reset(u16 adapter_index)
@@ -737,12 +654,6 @@ static void HPIMSGX__reset(u16 adapter_index)
         struct hpi_response hr;
 
         if (adapter_index == HPIMSGX_ALLADAPTERS) {
-                /* reset all responses to contain errors */
-                hpi_init_response(&hr, HPI_OBJ_SUBSYSTEM,
-                        HPI_SUBSYS_FIND_ADAPTERS, 0);
-                memcpy(&gRESP_HPI_SUBSYS_FIND_ADAPTERS, &hr,
-                        sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS));
-
                 for (adapter = 0; adapter < HPI_MAX_ADAPTERS; adapter++) {
 
                         hpi_init_response(&hr, HPI_OBJ_ADAPTER,
@@ -783,12 +694,6 @@ static void HPIMSGX__reset(u16 adapter_index)
                         rESP_HPI_ISTREAM_OPEN[adapter_index][i].h.error =
                                 HPI_ERROR_INVALID_OBJ;
                 }
-                if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                        s.aw_adapter_list[adapter_index]) {
-                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.
-                                s.aw_adapter_list[adapter_index] = 0;
-                        gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters--;
-                }
         }
 }
 
@@ -802,15 +707,9 @@ static u16 HPIMSGX__init(struct hpi_message *phm,
         hpi_handler_func *entry_point_func;
         struct hpi_response hr;
 
-        if (gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.num_adapters >= HPI_MAX_ADAPTERS)
-                return HPI_ERROR_BAD_ADAPTER_NUMBER;
-
         /* Init response here so we can pass in previous adapter list */
         hpi_init_response(&hr, phm->object, phm->function,
                 HPI_ERROR_INVALID_OBJ);
-        memcpy(hr.u.s.aw_adapter_list,
-                gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list,
-                sizeof(gRESP_HPI_SUBSYS_FIND_ADAPTERS.s.aw_adapter_list));
 
         entry_point_func =
                 hpi_lookup_entry_point_function(phm->u.s.resource.r.pci);
@@ -860,7 +759,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)
                                 struct hpi_response hr;
 
                                 HPI_DEBUG_LOG(DEBUG,
-                                        "close adapter %d ostream %d\n",
+                                        "Close adapter %d ostream %d\n",
                                         adapter, i);
 
                                 hpi_init_message_response(&hm, &hr,
@@ -884,7 +783,7 @@ static void HPIMSGX__cleanup(u16 adapter_index, void *h_owner)
                                 struct hpi_response hr;
 
                                 HPI_DEBUG_LOG(DEBUG,
-                                        "close adapter %d istream %d\n",
+                                        "Close adapter %d istream %d\n",
                                         adapter, i);
 
                                 hpi_init_message_response(&hm, &hr,
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 22dbd91811a4..cd624f13ff8e 100644
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -30,6 +30,7 @@ Common Linux HPI ioctl and module probe/remove functions
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <asm/uaccess.h>
+#include <linux/pci.h>
 #include <linux/stringify.h>
 
 #ifdef MODULE_FIRMWARE
@@ -45,7 +46,7 @@ MODULE_FIRMWARE("asihpi/dsp8900.bin");
 static int prealloc_stream_buf;
 module_param(prealloc_stream_buf, int, S_IRUGO);
 MODULE_PARM_DESC(prealloc_stream_buf,
-        "preallocate size for per-adapter stream buffer");
+        "Preallocate size for per-adapter stream buffer");
 
 /* Allow the debug level to be changed after module load.
  E.g.   echo 2 > /sys/module/asihpi/parameters/hpiDebugLevel
@@ -121,8 +122,8 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         phpi_ioctl_data = (struct hpi_ioctl_linux __user *)arg;
 
         /* Read the message and response pointers from user space.  */
-        if (get_user(puhm, &phpi_ioctl_data->phm) ||
-            get_user(puhr, &phpi_ioctl_data->phr)) {
+        if (get_user(puhm, &phpi_ioctl_data->phm)
+                || get_user(puhr, &phpi_ioctl_data->phr)) {
                 err = -EFAULT;
                 goto out;
         }
@@ -135,7 +136,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (hm->h.size > sizeof(*hm))
                 hm->h.size = sizeof(*hm);
 
-        /*printk(KERN_INFO "message size %d\n", hm->h.wSize); */
+        /* printk(KERN_INFO "message size %d\n", hm->h.wSize); */
 
         uncopied_bytes = copy_from_user(hm, puhm, hm->h.size);
         if (uncopied_bytes) {
@@ -155,8 +156,13 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 goto out;
         }
 
+        if (hm->h.adapter_index >= HPI_MAX_ADAPTERS) {
+                err = -EINVAL;
+                goto out;
+        }
+
         pa = &adapters[hm->h.adapter_index];
-        hr->h.size = 0;
+        hr->h.size = res_max_size;
         if (hm->h.object == HPI_OBJ_SUBSYSTEM) {
                 switch (hm->h.function) {
                 case HPI_SUBSYS_CREATE_ADAPTER:
@@ -216,7 +222,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                  */
                                 if (pa->buffer_size < size) {
                                         HPI_DEBUG_LOG(DEBUG,
-                                                "realloc adapter %d stream "
+                                                "Realloc adapter %d stream "
                                                 "buffer from %zd to %d\n",
                                                 hm->h.adapter_index,
                                                 pa->buffer_size, size);
@@ -259,7 +265,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 copy_from_user(pa->p_buffer, ptr, size);
                         if (uncopied_bytes)
                                 HPI_DEBUG_LOG(WARNING,
-                                        "missed %d of %d "
+                                        "Missed %d of %d "
                                         "bytes from user\n", uncopied_bytes,
                                         size);
                 }
@@ -271,7 +277,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 copy_to_user(ptr, pa->p_buffer, size);
                         if (uncopied_bytes)
                                 HPI_DEBUG_LOG(WARNING,
-                                        "missed %d of %d " "bytes to user\n",
+                                        "Missed %d of %d " "bytes to user\n",
                                         uncopied_bytes, size);
                 }
 
@@ -290,9 +296,9 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         if (hr->h.size > res_max_size) {
                 HPI_DEBUG_LOG(ERROR, "response too big %d %d\n", hr->h.size,
                         res_max_size);
-                /*HPI_DEBUG_MESSAGE(ERROR, hm); */
-                err = -EFAULT;
-                goto out;
+                hr->h.error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;
+                hr->h.specific_error = hr->h.size;
+                hr->h.size = sizeof(hr->h);
         }
 
         uncopied_bytes = copy_to_user(puhr, hr, hr->h.size);
@@ -320,18 +326,26 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
 
         memset(&adapter, 0, sizeof(adapter));
 
-        printk(KERN_DEBUG "probe PCI device (%04x:%04x,%04x:%04x,%04x)\n",
-                pci_dev->vendor, pci_dev->device, pci_dev->subsystem_vendor,
+        dev_printk(KERN_DEBUG, &pci_dev->dev,
+                "probe %04x:%04x,%04x:%04x,%04x\n", pci_dev->vendor,
+                pci_dev->device, pci_dev->subsystem_vendor,
                 pci_dev->subsystem_device, pci_dev->devfn);
 
+        if (pci_enable_device(pci_dev) < 0) {
+                dev_printk(KERN_ERR, &pci_dev->dev,
+                        "pci_enable_device failed, disabling device\n");
+                return -EIO;
+        }
+
+        pci_set_master(pci_dev);        /* also sets latency timer if < 16 */
+
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_CREATE_ADAPTER);
         hpi_init_response(&hr, HPI_OBJ_SUBSYSTEM, HPI_SUBSYS_CREATE_ADAPTER,
                 HPI_ERROR_PROCESSING_MESSAGE);
 
-        hm.adapter_index = -1;  /* an invalid index */
+        hm.adapter_index = HPI_ADAPTER_INDEX_INVALID;
 
-        /* fill in HPI_PCI information from kernel provided information */
         adapter.pci = pci_dev;
 
         nm = HPI_MAX_ADAPTER_MEM_SPACES;
@@ -359,19 +373,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
                 pci.ap_mem_base[idx] = adapter.ap_remapped_mem_base[idx];
         }
 
-        /* could replace Pci with direct pointer to pci_dev for linux
-           Instead wrap accessor functions for IDs etc.
-           Would it work for windows?
-         */
-        pci.bus_number = pci_dev->bus->number;
-        pci.vendor_id = (u16)pci_dev->vendor;
-        pci.device_id = (u16)pci_dev->device;
-        pci.subsys_vendor_id = (u16)(pci_dev->subsystem_vendor & 0xffff);
-        pci.subsys_device_id = (u16)(pci_dev->subsystem_device & 0xffff);
-        pci.device_number = pci_dev->devfn;
-        pci.interrupt = pci_dev->irq;
-        pci.p_os_data = pci_dev;
-
+        pci.pci_dev = pci_dev;
         hm.u.s.resource.bus_type = HPI_BUS_PCI;
         hm.u.s.resource.r.pci = &pci;
 
@@ -392,10 +394,10 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         }
 
         adapter.index = hr.u.s.adapter_index;
-        adapter.type = hr.u.s.aw_adapter_list[adapter.index];
+        adapter.type = hr.u.s.adapter_type;
         hm.adapter_index = adapter.index;
 
-        err = hpi_adapter_open(NULL, adapter.index);
+        err = hpi_adapter_open(adapter.index);
         if (err)
                 goto err;
 
@@ -407,8 +409,9 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev,
         mutex_init(&adapters[adapter.index].mutex);
         pci_set_drvdata(pci_dev, &adapters[adapter.index]);
 
-        printk(KERN_INFO "probe found adapter ASI%04X HPI index #%d.\n",
-                adapter.type, adapter.index);
+        dev_printk(KERN_INFO, &pci_dev->dev,
+                "probe succeeded for ASI%04X HPI index %d\n", adapter.type,
+                adapter.index);
 
         return 0;
 
@@ -439,7 +442,8 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
 
         hpi_init_message_response(&hm, &hr, HPI_OBJ_SUBSYSTEM,
                 HPI_SUBSYS_DELETE_ADAPTER);
-        hm.adapter_index = pa->index;
+        hm.obj_index = pa->index;
+        hm.adapter_index = HPI_ADAPTER_INDEX_INVALID;
         hpi_send_recv_ex(&hm, &hr, HOWNER_KERNEL);
 
         /* unmap PCI memory space, mapped during device init. */
@@ -450,20 +454,18 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev)
                 }
         }
 
-        if (pa->p_buffer) {
-                pa->buffer_size = 0;
+        if (pa->p_buffer)
                 vfree(pa->p_buffer);
-        }
 
         pci_set_drvdata(pci_dev, NULL);
-        /*
-           printk(KERN_INFO "PCI device (%04x:%04x,%04x:%04x,%04x),"
-           " HPI index # %d, removed.\n",
-           pci_dev->vendor, pci_dev->device,
-           pci_dev->subsystem_vendor,
-           pci_dev->subsystem_device, pci_dev->devfn,
-           pa->index);
-         */
+        if (1)
+                dev_printk(KERN_INFO, &pci_dev->dev,
+                        "remove %04x:%04x,%04x:%04x,%04x," " HPI index %d.\n",
+                        pci_dev->vendor, pci_dev->device,
+                        pci_dev->subsystem_vendor, pci_dev->subsystem_device,
+                        pci_dev->devfn, pa->index);
+
+        memset(pa, 0, sizeof(*pa));
 }
 
 void __init asihpi_init(void)
diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h
index 370f39b43f85..03273e729f99 100644
--- a/sound/pci/asihpi/hpios.h
+++ b/sound/pci/asihpi/hpios.h
@@ -27,9 +27,7 @@ HPI Operating System Specific macros for Linux Kernel driver
 #define HPI_OS_LINUX_KERNEL
 
 #define HPI_OS_DEFINED
-#define HPI_KERNEL_MODE
-
-#define HPI_REASSIGN_DUPLICATE_ADAPTER_IDX
+#define HPI_BUILD_KERNEL_MODE
 
 #include <linux/io.h>
 #include <asm/system.h>
@@ -135,20 +133,20 @@ static inline void cond_unlock(struct hpios_spinlock *l)
 
 #define hpios_msgxlock_init(obj)      spin_lock_init(&(obj)->lock)
 #define hpios_msgxlock_lock(obj)   cond_lock(obj)
-#define hpios_msgxlock_un_lock(obj) cond_unlock(obj)
+#define hpios_msgxlock_unlock(obj) cond_unlock(obj)
 
 #define hpios_dsplock_init(obj)       spin_lock_init(&(obj)->dsp_lock.lock)
 #define hpios_dsplock_lock(obj)    cond_lock(&(obj)->dsp_lock)
 #define hpios_dsplock_unlock(obj)  cond_unlock(&(obj)->dsp_lock)
 
 #ifdef CONFIG_SND_DEBUG
-#define HPI_DEBUG
+#define HPI_BUILD_DEBUG
 #endif
 
 #define HPI_ALIST_LOCKING
 #define hpios_alistlock_init(obj)    spin_lock_init(&((obj)->list_lock.lock))
 #define hpios_alistlock_lock(obj) spin_lock(&((obj)->list_lock.lock))
-#define hpios_alistlock_un_lock(obj) spin_unlock(&((obj)->list_lock.lock))
+#define hpios_alistlock_unlock(obj) spin_unlock(&((obj)->list_lock.lock))
 
 struct hpi_adapter {
         /* mutex prevents contention for one card
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 49d572a7b235..3119cd97a217 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -522,7 +522,7 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
                 atiixp_read(chip, CMD);
                 mdelay(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-                if (--timeout) {
+                if (!--timeout) {
                         snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
                         break;
                 }
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 91d7036b6411..2f74c2fdf1ea 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -498,7 +498,7 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)
                 atiixp_read(chip, CMD);
                 msleep(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-                if (--timeout) {
+                if (!--timeout) {
                         snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");
                         break;
                 }
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 38602b85874d..278ed8189fca 100644
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -896,7 +896,8 @@ static int __devinit vortex_eq_init(vortex_t * vortex)
                 if ((kcontrol =
                      snd_ctl_new1(&vortex_eq_kcontrol, vortex)) == NULL)
                         return -ENOMEM;
-                strcpy(kcontrol->id.name, EqBandLabels[i]);
+                snprintf(kcontrol->id.name, sizeof(kcontrol->id.name),
+                        "%s Playback Volume", EqBandLabels[i]);
                 kcontrol->private_value = i;
                 if ((err = snd_ctl_add(vortex->card, kcontrol)) < 0)
                         return err;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 573594bf3225..5715c4d05573 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1,6 +1,5 @@
-/*
- *  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).
- *  Copyright (C) 2002, 2005 - 2010 by Andreas Mohr <andi AT lisas.de>
+/*  azt3328.c - driver for Aztech AZF3328 based soundcards (e.g. PCI168).
+ *  Copyright (C) 2002, 2005 - 2011 by Andreas Mohr <andi AT lisas.de>
  *
  *  Framework borrowed from Bart Hartgers's als4000.c.
  *  Driver developed on PCI168 AP(W) version (PCI rev. 10, subsystem ID 1801),
@@ -66,6 +65,13 @@
  *    addresses illegally. So far unfortunately it looks like the very flexible
  *    ALSA AC97 support is still not enough to easily compensate for such a
  *    grave layout violation despite all tweaks and quirks mechanisms it offers.
+ *    Well, not quite: now ac97 layer is much improved (bus-specific ops!),
+ *    thus I was able to implement support - it's actually working quite well.
+ *    An interesting item might be Aztech AMR 2800-W, since it's an AC97
+ *    modem card which might reveal the Aztech-specific codec ID which
+ *    we might want to pretend, too. Dito PCI168's brother, PCI368,
+ *    where the advertising datasheet says it's AC97-based and has a
+ *    Digital Enhanced Game Port.
  *  - builtin genuine OPL3 - verified to work fine, 20080506
  *  - full duplex 16bit playback/record at independent sampling rate
  *  - MPU401 (+ legacy address support, claimed by one official spec sheet)
@@ -189,6 +195,16 @@
 #include <sound/mpu401.h>
 #include <sound/opl3.h>
 #include <sound/initval.h>
+/*
+ * Config switch, to use ALSA's AC97 layer instead of old custom mixer crap.
+ * If the AC97 compatibility parts we needed to implement locally turn out
+ * to work nicely, then remove the old implementation eventually.
+ */
+#define AZF_USE_AC97_LAYER 1
+
+#ifdef AZF_USE_AC97_LAYER
+#include <sound/ac97_codec.h>
+#endif
 #include "azt3328.h"
 
 MODULE_AUTHOR("Andreas Mohr <andi AT lisas.de>");
@@ -328,6 +344,10 @@ struct snd_azf3328 {
         /* playback, recording and I2S out codecs */
         struct snd_azf3328_codec_data codecs[3];
 
+#ifdef AZF_USE_AC97_LAYER
+        struct snd_ac97 *ac97;
+#endif
+
         struct snd_card *card;
         struct snd_rawmidi *rmidi;
 
@@ -506,7 +526,7 @@ snd_azf3328_mixer_inw(const struct snd_azf3328 *chip, unsigned reg)
 #define AZF_MUTE_BIT 0x80
 
 static bool
-snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,
+snd_azf3328_mixer_mute_control(const struct snd_azf3328 *chip,
                            unsigned reg, bool do_mute
 )
 {
@@ -521,6 +541,323 @@ snd_azf3328_mixer_set_mute(const struct snd_azf3328 *chip,
         return (do_mute) ? !updated : updated;
 }
 
+static inline bool
+snd_azf3328_mixer_mute_control_master(const struct snd_azf3328 *chip,
+                           bool do_mute
+)
+{
+        return snd_azf3328_mixer_mute_control(
+                chip,
+                IDX_MIXER_PLAY_MASTER,
+                do_mute
+        );
+}
+
+static inline bool
+snd_azf3328_mixer_mute_control_pcm(const struct snd_azf3328 *chip,
+                           bool do_mute
+)
+{
+        return snd_azf3328_mixer_mute_control(
+                chip,
+                IDX_MIXER_WAVEOUT,
+                do_mute
+        );
+}
+
+static inline void
+snd_azf3328_mixer_reset(const struct snd_azf3328 *chip)
+{
+        /* reset (close) mixer:
+         * first mute master volume, then reset
+         */
+        snd_azf3328_mixer_mute_control_master(chip, 1);
+        snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);
+}
+
+#ifdef AZF_USE_AC97_LAYER
+
+static inline void
+snd_azf3328_mixer_ac97_map_unsupported(unsigned short reg, const char *mode)
+{
+        /* need to add some more or less clever emulation? */
+        printk(KERN_WARNING
+                "azt3328: missing %s emulation for AC97 register 0x%02x!\n",
+                mode, reg);
+}
+
+/*
+ * Need to have _special_ AC97 mixer hardware register index mapper,
+ * to compensate for the issue of a rather AC97-incompatible hardware layout.
+ */
+#define AZF_REG_MASK 0x3f
+#define AZF_AC97_REG_UNSUPPORTED 0x8000
+#define AZF_AC97_REG_REAL_IO_READ 0x4000
+#define AZF_AC97_REG_REAL_IO_WRITE 0x2000
+#define AZF_AC97_REG_REAL_IO_RW \
+        (AZF_AC97_REG_REAL_IO_READ | AZF_AC97_REG_REAL_IO_WRITE)
+#define AZF_AC97_REG_EMU_IO_READ 0x0400
+#define AZF_AC97_REG_EMU_IO_WRITE 0x0200
+#define AZF_AC97_REG_EMU_IO_RW \
+        (AZF_AC97_REG_EMU_IO_READ | AZF_AC97_REG_EMU_IO_WRITE)
+static unsigned short
+snd_azf3328_mixer_ac97_map_reg_idx(unsigned short reg)
+{
+        static const struct {
+                unsigned short azf_reg;
+        } azf_reg_mapper[] = {
+                /* Especially when taking into consideration
+                 * mono/stereo-based sequence of azf vs. AC97 control series,
+                 * it's quite obvious that azf simply got rid
+                 * of the AC97_HEADPHONE control at its intended offset,
+                 * thus shifted _all_ controls by one,
+                 * and _then_ simply added it as an FMSYNTH control at the end,
+                 * to make up for the offset.
+                 * This means we'll have to translate indices here as
+                 * needed and then do some tiny AC97 patch action
+                 * (snd_ac97_rename_vol_ctl() etc.) - that's it.
+                 */
+                { /* AC97_RESET */ IDX_MIXER_RESET
+                        | AZF_AC97_REG_REAL_IO_WRITE
+                        | AZF_AC97_REG_EMU_IO_READ },
+                { /* AC97_MASTER */ IDX_MIXER_PLAY_MASTER },
+                 /* note large shift: AC97_HEADPHONE to IDX_MIXER_FMSYNTH! */
+                { /* AC97_HEADPHONE */ IDX_MIXER_FMSYNTH },
+                { /* AC97_MASTER_MONO */ IDX_MIXER_MODEMOUT },
+                { /* AC97_MASTER_TONE */ IDX_MIXER_BASSTREBLE },
+                { /* AC97_PC_BEEP */ IDX_MIXER_PCBEEP },
+                { /* AC97_PHONE */ IDX_MIXER_MODEMIN },
+                { /* AC97_MIC */ IDX_MIXER_MIC },
+                { /* AC97_LINE */ IDX_MIXER_LINEIN },
+                { /* AC97_CD */ IDX_MIXER_CDAUDIO },
+                { /* AC97_VIDEO */ IDX_MIXER_VIDEO },
+                { /* AC97_AUX */ IDX_MIXER_AUX },
+                { /* AC97_PCM */ IDX_MIXER_WAVEOUT },
+                { /* AC97_REC_SEL */ IDX_MIXER_REC_SELECT },
+                { /* AC97_REC_GAIN */ IDX_MIXER_REC_VOLUME },
+                { /* AC97_REC_GAIN_MIC */ AZF_AC97_REG_EMU_IO_RW },
+                { /* AC97_GENERAL_PURPOSE */ IDX_MIXER_ADVCTL2 },
+                { /* AC97_3D_CONTROL */ IDX_MIXER_ADVCTL1 },
+        };
+
+        unsigned short reg_azf = AZF_AC97_REG_UNSUPPORTED;
+
+        /* azf3328 supports the low-numbered and low-spec:ed range
+           of AC97 regs only */
+        if (reg <= AC97_3D_CONTROL) {
+                unsigned short reg_idx = reg / 2;
+                reg_azf = azf_reg_mapper[reg_idx].azf_reg;
+                /* a translation-only entry means it's real read/write: */
+                if (!(reg_azf & ~AZF_REG_MASK))
+                        reg_azf |= AZF_AC97_REG_REAL_IO_RW;
+        } else {
+                switch (reg) {
+                case AC97_POWERDOWN:
+                        reg_azf = AZF_AC97_REG_EMU_IO_RW;
+                        break;
+                case AC97_EXTENDED_ID:
+                        reg_azf = AZF_AC97_REG_EMU_IO_READ;
+                        break;
+                case AC97_EXTENDED_STATUS:
+                        /* I don't know what the h*ll AC97 layer
+                         * would consult this _extended_ register for
+                         * given a base-AC97-advertised card,
+                         * but let's just emulate it anyway :-P
+                         */
+                        reg_azf = AZF_AC97_REG_EMU_IO_RW;
+                        break;
+                case AC97_VENDOR_ID1:
+                case AC97_VENDOR_ID2:
+                        reg_azf = AZF_AC97_REG_EMU_IO_READ;
+                        break;
+                }
+        }
+        return reg_azf;
+}
+
+static const unsigned short
+azf_emulated_ac97_caps =
+        AC97_BC_DEDICATED_MIC |
+        AC97_BC_BASS_TREBLE |
+        /* Headphone is an FM Synth control here */
+        AC97_BC_HEADPHONE |
+        /* no AC97_BC_LOUDNESS! */
+        /* mask 0x7c00 is
+           vendor-specific 3D enhancement
+           vendor indicator.
+           Since there actually _is_ an
+           entry for Aztech Labs
+           (13), make damn sure
+           to indicate it. */
+        (13 << 10);
+
+static const unsigned short
+azf_emulated_ac97_powerdown =
+        /* pretend everything to be active */
+                AC97_PD_ADC_STATUS |
+                AC97_PD_DAC_STATUS |
+                AC97_PD_MIXER_STATUS |
+                AC97_PD_VREF_STATUS;
+
+/*
+ * Emulated, _inofficial_ vendor ID
+ * (there might be some devices such as the MR 2800-W
+ * which could reveal the real Aztech AC97 ID).
+ * We choose to use "AZT" prefix, and then use 1 to indicate PCI168
+ * (better don't use 0x68 since there's a PCI368 as well).
+ */
+static const unsigned int
+azf_emulated_ac97_vendor_id = 0x415a5401;
+
+static unsigned short
+snd_azf3328_mixer_ac97_read(struct snd_ac97 *ac97, unsigned short reg_ac97)
+{
+        const struct snd_azf3328 *chip = ac97->private_data;
+        unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);
+        unsigned short reg_val = 0;
+        bool unsupported = 0;
+
+        snd_azf3328_dbgmixer(
+                "snd_azf3328_mixer_ac97_read reg_ac97 %u\n",
+                        reg_ac97
+        );
+        if (reg_azf & AZF_AC97_REG_UNSUPPORTED)
+                unsupported = 1;
+        else {
+                if (reg_azf & AZF_AC97_REG_REAL_IO_READ)
+                        reg_val = snd_azf3328_mixer_inw(chip,
+                                                reg_azf & AZF_REG_MASK);
+                else {
+                        /*
+                         * Proceed with dummy I/O read,
+                         * to ensure compatible timing where this may matter.
+                         * (ALSA AC97 layer usually doesn't call I/O functions
+                         * due to intelligent I/O caching anyway)
+                         * Choose a mixer register that's thoroughly unrelated
+                         * to common audio (try to minimize distortion).
+                         */
+                        snd_azf3328_mixer_inw(chip, IDX_MIXER_SOMETHING30H);
+                }
+
+                if (reg_azf & AZF_AC97_REG_EMU_IO_READ) {
+                        switch (reg_ac97) {
+                        case AC97_RESET:
+                                reg_val |= azf_emulated_ac97_caps;
+                                break;
+                        case AC97_POWERDOWN:
+                                reg_val |= azf_emulated_ac97_powerdown;
+                                break;
+                        case AC97_EXTENDED_ID:
+                        case AC97_EXTENDED_STATUS:
+                                /* AFAICS we simply can't support anything: */
+                                reg_val |= 0;
+                                break;
+                        case AC97_VENDOR_ID1:
+                                reg_val = azf_emulated_ac97_vendor_id >> 16;
+                                break;
+                        case AC97_VENDOR_ID2:
+                                reg_val = azf_emulated_ac97_vendor_id & 0xffff;
+                                break;
+                        default:
+                                unsupported = 1;
+                                break;
+                        }
+                }
+        }
+        if (unsupported)
+                snd_azf3328_mixer_ac97_map_unsupported(reg_ac97, "read");
+
+        return reg_val;
+}
+
+static void
+snd_azf3328_mixer_ac97_write(struct snd_ac97 *ac97,
+                     unsigned short reg_ac97, unsigned short val)
+{
+        const struct snd_azf3328 *chip = ac97->private_data;
+        unsigned short reg_azf = snd_azf3328_mixer_ac97_map_reg_idx(reg_ac97);
+        bool unsupported = 0;
+
+        snd_azf3328_dbgmixer(
+                "snd_azf3328_mixer_ac97_write reg_ac97 %u val %u\n",
+                        reg_ac97, val
+        );
+        if (reg_azf & AZF_AC97_REG_UNSUPPORTED)
+                unsupported = 1;
+        else {
+                if (reg_azf & AZF_AC97_REG_REAL_IO_WRITE)
+                        snd_azf3328_mixer_outw(
+                                chip,
+                                reg_azf & AZF_REG_MASK,
+                                val
+                        );
+                else
+                if (reg_azf & AZF_AC97_REG_EMU_IO_WRITE) {
+                        switch (reg_ac97) {
+                        case AC97_REC_GAIN_MIC:
+                        case AC97_POWERDOWN:
+                        case AC97_EXTENDED_STATUS:
+                                /*
+                                 * Silently swallow these writes.
+                                 * Since for most registers our card doesn't
+                                 * actually support a comparable feature,
+                                 * this is exactly what we should do here.
+                                 * The AC97 layer's I/O caching probably
+                                 * automatically takes care of all the rest...
+                                 * (remembers written values etc.)
+                                 */
+                                break;
+                        default:
+                                unsupported = 1;
+                                break;
+                        }
+                }
+        }
+        if (unsupported)
+                snd_azf3328_mixer_ac97_map_unsupported(reg_ac97, "write");
+}
+
+static int __devinit
+snd_azf3328_mixer_new(struct snd_azf3328 *chip)
+{
+        struct snd_ac97_bus *bus;
+        struct snd_ac97_template ac97;
+        static struct snd_ac97_bus_ops ops = {
+                .write = snd_azf3328_mixer_ac97_write,
+                .read = snd_azf3328_mixer_ac97_read,
+        };
+        int rc;
+
+        memset(&ac97, 0, sizeof(ac97));
+        ac97.scaps = AC97_SCAP_SKIP_MODEM
+                        | AC97_SCAP_AUDIO /* we support audio! */
+                        | AC97_SCAP_NO_SPDIF;
+        ac97.private_data = chip;
+        ac97.pci = chip->pci;
+
+        /*
+         * ALSA's AC97 layer has terrible init crackling issues,
+         * unfortunately, and since it makes use of AC97_RESET,
+         * there's no use trying to mute Master Playback proactively.
+         */
+
+        rc = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus);
+        if (!rc)
+                rc = snd_ac97_mixer(bus, &ac97, &chip->ac97);
+                /*
+                 * Make sure to complain loudly in case of AC97 init failure,
+                 * since failure may happen quite often,
+                 * due to this card being a very quirky AC97 "lookalike".
+                 */
+        if (rc)
+                printk(KERN_ERR "azt3328: AC97 init failed, err %d!\n", rc);
+
+        /* If we return an error here, then snd_card_free() should
+         * free up any ac97 codecs that got created, as well as the bus.
+         */
+        return rc;
+}
+#else /* AZF_USE_AC97_LAYER */
 static void
 snd_azf3328_mixer_write_volume_gradually(const struct snd_azf3328 *chip,
                                          unsigned reg,
@@ -945,6 +1282,7 @@ snd_azf3328_mixer_new(struct snd_azf3328 *chip)
         snd_azf3328_dbgcallleave();
         return 0;
 }
+#endif /* AZF_USE_AC97_LAYER */
 
 static int
 snd_azf3328_hw_params(struct snd_pcm_substream *substream,
@@ -1233,8 +1571,8 @@ snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (is_main_mixer_playback_codec) {
                         /* mute WaveOut (avoid clicking during setup) */
                         previously_muted =
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 1
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 1
                                 );
                 }
 
@@ -1290,8 +1628,8 @@ snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (is_main_mixer_playback_codec) {
                         /* now unmute WaveOut */
                         if (!previously_muted)
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 0
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 0
                                 );
                 }
 
@@ -1315,8 +1653,8 @@ snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (is_main_mixer_playback_codec) {
                         /* mute WaveOut (avoid clicking during setup) */
                         previously_muted =
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 1
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 1
                                 );
                 }
 
@@ -1341,8 +1679,8 @@ snd_azf3328_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
                 if (is_main_mixer_playback_codec) {
                         /* now unmute WaveOut */
                         if (!previously_muted)
-                                snd_azf3328_mixer_set_mute(
-                                                chip, IDX_MIXER_WAVEOUT, 0
+                                snd_azf3328_mixer_mute_control_pcm(
+                                                chip, 0
                                 );
                 }
 
@@ -2050,11 +2388,7 @@ snd_azf3328_free(struct snd_azf3328 *chip)
         if (chip->irq < 0)
                 goto __end_hw;
 
-        /* reset (close) mixer:
-         * first mute master volume, then reset
-         */
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);
-        snd_azf3328_mixer_outw(chip, IDX_MIXER_RESET, 0x0000);
+        snd_azf3328_mixer_reset(chip);
 
         snd_azf3328_timer_stop(chip->timer);
         snd_azf3328_gameport_free(chip);
@@ -2407,6 +2741,55 @@ snd_azf3328_suspend_regs(unsigned long io_addr, unsigned count, u32 *saved_regs)
         }
 }
 
+static inline void
+snd_azf3328_resume_regs(const u32 *saved_regs,
+                        unsigned long io_addr,
+                        unsigned count
+)
+{
+        unsigned reg;
+
+        for (reg = 0; reg < count; ++reg) {
+                outl(*saved_regs, io_addr);
+                snd_azf3328_dbgpm("resume: io 0x%04lx: 0x%08x --> 0x%08x\n",
+                        io_addr, *saved_regs, inl(io_addr));
+                ++saved_regs;
+                io_addr += sizeof(*saved_regs);
+        }
+}
+
+static inline void
+snd_azf3328_suspend_ac97(struct snd_azf3328 *chip)
+{
+#ifdef AZF_USE_AC97_LAYER
+        snd_ac97_suspend(chip->ac97);
+#else
+        snd_azf3328_suspend_regs(chip->mixer_io,
+                ARRAY_SIZE(chip->saved_regs_mixer), chip->saved_regs_mixer);
+
+        /* make sure to disable master volume etc. to prevent looping sound */
+        snd_azf3328_mixer_mute_control_master(chip, 1);
+        snd_azf3328_mixer_mute_control_pcm(chip, 1);
+#endif /* AZF_USE_AC97_LAYER */
+}
+
+static inline void
+snd_azf3328_resume_ac97(const struct snd_azf3328 *chip)
+{
+#ifdef AZF_USE_AC97_LAYER
+        snd_ac97_resume(chip->ac97);
+#else
+        snd_azf3328_resume_regs(chip->saved_regs_mixer, chip->mixer_io,
+                                        ARRAY_SIZE(chip->saved_regs_mixer));
+
+        /* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)
+           and IDX_MIXER_RESET (offset 0x00) get touched at the same time,
+           resulting in a mixer reset condition persisting until _after_
+           master vol was restored. Thus master vol needs an extra restore. */
+        outw(((u16 *)chip->saved_regs_mixer)[1], chip->mixer_io + 2);
+#endif /* AZF_USE_AC97_LAYER */
+}
+
 static int
 snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
 {
@@ -2420,12 +2803,7 @@ snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
         snd_pcm_suspend_all(chip->pcm[AZF_CODEC_PLAYBACK]);
         snd_pcm_suspend_all(chip->pcm[AZF_CODEC_I2S_OUT]);
 
-        snd_azf3328_suspend_regs(chip->mixer_io,
-                ARRAY_SIZE(chip->saved_regs_mixer), chip->saved_regs_mixer);
-
-        /* make sure to disable master volume etc. to prevent looping sound */
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_PLAY_MASTER, 1);
-        snd_azf3328_mixer_set_mute(chip, IDX_MIXER_WAVEOUT, 1);
+        snd_azf3328_suspend_ac97(chip);
 
         snd_azf3328_suspend_regs(chip->ctrl_io,
                 ARRAY_SIZE(chip->saved_regs_ctrl), chip->saved_regs_ctrl);
@@ -2447,23 +2825,6 @@ snd_azf3328_suspend(struct pci_dev *pci, pm_message_t state)
         return 0;
 }
 
-static inline void
-snd_azf3328_resume_regs(const u32 *saved_regs,
-                        unsigned long io_addr,
-                        unsigned count
-)
-{
-        unsigned reg;
-
-        for (reg = 0; reg < count; ++reg) {
-                outl(*saved_regs, io_addr);
-                snd_azf3328_dbgpm("resume: io 0x%04lx: 0x%08x --> 0x%08x\n",
-                        io_addr, *saved_regs, inl(io_addr));
-                ++saved_regs;
-                io_addr += sizeof(*saved_regs);
-        }
-}
-
 static int
 snd_azf3328_resume(struct pci_dev *pci)
 {
@@ -2487,14 +2848,7 @@ snd_azf3328_resume(struct pci_dev *pci)
         snd_azf3328_resume_regs(chip->saved_regs_opl3, chip->opl3_io,
                                         ARRAY_SIZE(chip->saved_regs_opl3));
 
-        snd_azf3328_resume_regs(chip->saved_regs_mixer, chip->mixer_io,
-                                        ARRAY_SIZE(chip->saved_regs_mixer));
-
-        /* unfortunately with 32bit transfers, IDX_MIXER_PLAY_MASTER (0x02)
-           and IDX_MIXER_RESET (offset 0x00) get touched at the same time,
-           resulting in a mixer reset condition persisting until _after_
-           master vol was restored. Thus master vol needs an extra restore. */
-        outw(((u16 *)chip->saved_regs_mixer)[1], chip->mixer_io + 2);
+        snd_azf3328_resume_ac97(chip);
 
         snd_azf3328_resume_regs(chip->saved_regs_ctrl, chip->ctrl_io,
                                         ARRAY_SIZE(chip->saved_regs_ctrl));
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index 1bff80cde0a2..b9321544c31c 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -869,7 +869,7 @@ spdif_passthru_playback_setup(struct ct_atc *atc, struct ct_atc_pcm *apcm)
         mutex_lock(&atc->atc_mutex);
         dao->ops->get_spos(dao, &status);
         if (((status >> 24) & IEC958_AES3_CON_FS) != iec958_con_fs) {
-                status &= ((~IEC958_AES3_CON_FS) << 24);
+                status &= ~(IEC958_AES3_CON_FS << 24);
                 status |= (iec958_con_fs << 24);
                 dao->ops->set_spos(dao, status);
                 dao->ops->commit_write(dao);
diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index af56eb949bde..47d9ea97de02 100644
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -176,6 +176,7 @@ static int dao_set_left_input(struct dao *dao, struct rsc *input)
         if (!entry)
                 return -ENOMEM;
 
+        dao->ops->clear_left_input(dao);
         /* Program master and conjugate resources */
         input->ops->master(input);
         daio->rscl.ops->master(&daio->rscl);
@@ -204,6 +205,7 @@ static int dao_set_right_input(struct dao *dao, struct rsc *input)
         if (!entry)
                 return -ENOMEM;
 
+        dao->ops->clear_right_input(dao);
         /* Program master and conjugate resources */
         input->ops->master(input);
         daio->rscr.ops->master(&daio->rscr);
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index b6b11bfe7574..5364164674e4 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -1307,10 +1307,10 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
         set_field(&pllctl, PLLCTL_B, 0);
         if (48000 == rsr) {
                 set_field(&pllctl, PLLCTL_FD, 16 - 2);
-                set_field(&pllctl, PLLCTL_RD, 1 - 1);
+                set_field(&pllctl, PLLCTL_RD, 1 - 1); /* 3000*16/1 = 48000 */
         } else { /* 44100 */
                 set_field(&pllctl, PLLCTL_FD, 147 - 2);
-                set_field(&pllctl, PLLCTL_RD, 10 - 1);
+                set_field(&pllctl, PLLCTL_RD, 10 - 1); /* 3000*147/10 = 44100 */
         }
         hw_write_20kx(hw, PLL_CTL, pllctl);
         mdelay(40);
@@ -1740,6 +1740,10 @@ static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)
         return data;
 }
 
+#define MIC_BOOST_0DB 0xCF
+#define MIC_BOOST_STEPS_PER_DB 2
+#define MIC_BOOST_20DB (MIC_BOOST_0DB + 20 * MIC_BOOST_STEPS_PER_DB)
+
 static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)
 {
         u32 data;
@@ -1751,10 +1755,12 @@ static int hw_adc_input_select(struct hw *hw, enum ADCSRC type)
                 hw_write_20kx(hw, GPIO_DATA, data);
                 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),
                                 MAKE_WM8775_DATA(0x101)); /* Mic-in */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCL, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCR, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
                 break;
         case ADC_LINEIN:
                 data &= ~(0x1 << 14);
@@ -1827,10 +1833,12 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
 
                 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_ADCMC, 0x101),
                                 MAKE_WM8775_DATA(0x101)); /* Mic-in */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCL, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
-                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_AADCR, 0xE7),
-                                MAKE_WM8775_DATA(0xE7)); /* +12dB boost */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCL, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
+                hw20k2_i2c_write(hw,
+                                MAKE_WM8775_ADDR(WM8775_AADCR, MIC_BOOST_20DB),
+                                MAKE_WM8775_DATA(MIC_BOOST_20DB)); /* +20dB */
         } else if (mux == 2) {
                 /* Configures GPIO data to select Line-in */
                 data &= ~(0x1 << 14);
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index 15c1e7271ea8..c3519ff42fbb 100644
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -566,19 +566,6 @@ static int ct_spdif_get_mask(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-static int ct_spdif_default_get(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *ucontrol)
-{
-        unsigned int status = SNDRV_PCM_DEFAULT_CON_SPDIF;
-
-        ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
-        ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
-        ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
-        ucontrol->value.iec958.status[3] = (status >> 24) & 0xff;
-
-        return 0;
-}
-
 static int ct_spdif_get(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_value *ucontrol)
 {
@@ -586,6 +573,10 @@ static int ct_spdif_get(struct snd_kcontrol *kcontrol,
         unsigned int status;
 
         atc->spdif_out_get_status(atc, &status);
+
+        if (status == 0)
+                status = SNDRV_PCM_DEFAULT_CON_SPDIF;
+
         ucontrol->value.iec958.status[0] = (status >> 0) & 0xff;
         ucontrol->value.iec958.status[1] = (status >> 8) & 0xff;
         ucontrol->value.iec958.status[2] = (status >> 16) & 0xff;
@@ -629,7 +620,7 @@ static struct snd_kcontrol_new iec958_default_ctl = {
         .name           = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
         .count          = 1,
         .info           = ct_spdif_info,
-        .get            = ct_spdif_default_get,
+        .get            = ct_spdif_get,
         .put            = ct_spdif_put,
         .private_value  = MIXER_IEC958_DEFAULT
 };
diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 65da6e466f80..b78f3fc3c33c 100644
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -52,8 +52,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size)
 
         if (entry->size == size) {
                 /* Move the vm node from unused list to used list directly */
-                list_del(&entry->list);
-                list_add(&entry->list, &vm->used);
+                list_move(&entry->list, &vm->used);
                 vm->size -= size;
                 block = entry;
                 goto out;
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 66c7fb3ced3e..5e619a84da06 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -926,7 +926,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
         /* Unknown. */
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
-        /* IRQ Enable: Alll on */
+        /* IRQ Enable: All on */
         /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
         /* IRQ Enable: All off */
         snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 639d2746713f..f1a03f223495 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4635,7 +4635,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1558, 0x5401, "ASUS", ALC880_ASUS_DIG2),
         SND_PCI_QUIRK(0x1565, 0x8202, "Biostar", ALC880_5ST_DIG),
         SND_PCI_QUIRK(0x1584, 0x9050, "Uniwill", ALC880_UNIWILL_DIG),
-        SND_PCI_QUIRK(0x1584, 0x9054, "Uniwlll", ALC880_F1734),
+        SND_PCI_QUIRK(0x1584, 0x9054, "Uniwill", ALC880_F1734),
         SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
         SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_UNIWILL_P53),
         SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 13cec1e5ced9..2ae8d29500a8 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -341,9 +341,9 @@ static int snd_intel8x0m_codec_semaphore(struct intel8x0m *chip, unsigned int co
         return -EBUSY;
 }
  
-static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
-                                     unsigned short reg,
-                                     unsigned short val)
+static void snd_intel8x0m_codec_write(struct snd_ac97 *ac97,
+                                      unsigned short reg,
+                                      unsigned short val)
 {
         struct intel8x0m *chip = ac97->private_data;
         
@@ -354,8 +354,8 @@ static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
         iaputword(chip, reg + ac97->num * 0x80, val);
 }
 
-static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,
-                                              unsigned short reg)
+static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97,
+                                               unsigned short reg)
 {
         struct intel8x0m *chip = ac97->private_data;
         unsigned short res;
@@ -385,7 +385,7 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,
 /*
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev) 
+static void snd_intel8x0m_setup_periods(struct intel8x0m *chip, struct ichdev *ichdev)
 {
         int idx;
         u32 *bdbar = ichdev->bdbar;
@@ -437,7 +437,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
  *  Interrupt handler
  */
 
-static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ichdev)
+static inline void snd_intel8x0m_update(struct intel8x0m *chip, struct ichdev *ichdev)
 {
         unsigned long port = ichdev->reg_offset;
         int civ, i, step;
@@ -489,7 +489,7 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic
         iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI);
 }
 
-static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
+static irqreturn_t snd_intel8x0m_interrupt(int irq, void *dev_id)
 {
         struct intel8x0m *chip = dev_id;
         struct ichdev *ichdev;
@@ -512,7 +512,7 @@ static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
         for (i = 0; i < chip->bdbars_count; i++) {
                 ichdev = &chip->ichd[i];
                 if (status & ichdev->int_sta_mask)
-                        snd_intel8x0_update(chip, ichdev);
+                        snd_intel8x0m_update(chip, ichdev);
         }
 
         /* ack them */
@@ -526,7 +526,7 @@ static irqreturn_t snd_intel8x0_interrupt(int irq, void *dev_id)
  *  PCM part
  */
 
-static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+static int snd_intel8x0m_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct intel8x0m *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
@@ -561,18 +561,18 @@ static int snd_intel8x0_pcm_trigger(struct snd_pcm_substream *substream, int cmd
         return 0;
 }
 
-static int snd_intel8x0_hw_params(struct snd_pcm_substream *substream,
+static int snd_intel8x0m_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 
-static int snd_intel8x0_hw_free(struct snd_pcm_substream *substream)
+static int snd_intel8x0m_hw_free(struct snd_pcm_substream *substream)
 {
         return snd_pcm_lib_free_pages(substream);
 }
 
-static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t snd_intel8x0m_pcm_pointer(struct snd_pcm_substream *substream)
 {
         struct intel8x0m *chip = snd_pcm_substream_chip(substream);
         struct ichdev *ichdev = get_ichdev(substream);
@@ -600,7 +600,7 @@ static int snd_intel8x0m_pcm_prepare(struct snd_pcm_substream *substream)
         ichdev->fragsize = snd_pcm_lib_period_bytes(substream);
         snd_ac97_write(ichdev->ac97, AC97_LINE1_RATE, runtime->rate);
         snd_ac97_write(ichdev->ac97, AC97_LINE1_LEVEL, 0);
-        snd_intel8x0_setup_periods(chip, ichdev);
+        snd_intel8x0m_setup_periods(chip, ichdev);
         return 0;
 }
 
@@ -682,22 +682,22 @@ static struct snd_pcm_ops snd_intel8x0m_playback_ops = {
         .open =         snd_intel8x0m_playback_open,
         .close =        snd_intel8x0m_playback_close,
         .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0_hw_params,
-        .hw_free =      snd_intel8x0_hw_free,
+        .hw_params =    snd_intel8x0m_hw_params,
+        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0_pcm_trigger,
-        .pointer =      snd_intel8x0_pcm_pointer,
+        .trigger =      snd_intel8x0m_pcm_trigger,
+        .pointer =      snd_intel8x0m_pcm_pointer,
 };
 
 static struct snd_pcm_ops snd_intel8x0m_capture_ops = {
         .open =         snd_intel8x0m_capture_open,
         .close =        snd_intel8x0m_capture_close,
         .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_intel8x0_hw_params,
-        .hw_free =      snd_intel8x0_hw_free,
+        .hw_params =    snd_intel8x0m_hw_params,
+        .hw_free =      snd_intel8x0m_hw_free,
         .prepare =      snd_intel8x0m_pcm_prepare,
-        .trigger =      snd_intel8x0_pcm_trigger,
-        .pointer =      snd_intel8x0_pcm_pointer,
+        .trigger =      snd_intel8x0m_pcm_trigger,
+        .pointer =      snd_intel8x0m_pcm_pointer,
 };
 
 
@@ -710,7 +710,7 @@ struct ich_pcm_table {
         int ac97_idx;
 };
 
-static int __devinit snd_intel8x0_pcm1(struct intel8x0m *chip, int device,
+static int __devinit snd_intel8x0m_pcm1(struct intel8x0m *chip, int device,
                                        struct ich_pcm_table *rec)
 {
         struct snd_pcm *pcm;
@@ -759,7 +759,7 @@ static struct ich_pcm_table intel_pcms[] __devinitdata = {
         },
 };
 
-static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
+static int __devinit snd_intel8x0m_pcm(struct intel8x0m *chip)
 {
         int i, tblsize, device, err;
         struct ich_pcm_table *tbl, *rec;
@@ -791,7 +791,7 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
                         if (! chip->ichd[rec->ac97_idx].ac97)
                                 continue;
                 }
-                err = snd_intel8x0_pcm1(chip, device, rec);
+                err = snd_intel8x0m_pcm1(chip, device, rec);
                 if (err < 0)
                         return err;
                 device++;
@@ -806,20 +806,20 @@ static int __devinit snd_intel8x0_pcm(struct intel8x0m *chip)
  *  Mixer part
  */
 
-static void snd_intel8x0_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
+static void snd_intel8x0m_mixer_free_ac97_bus(struct snd_ac97_bus *bus)
 {
         struct intel8x0m *chip = bus->private_data;
         chip->ac97_bus = NULL;
 }
 
-static void snd_intel8x0_mixer_free_ac97(struct snd_ac97 *ac97)
+static void snd_intel8x0m_mixer_free_ac97(struct snd_ac97 *ac97)
 {
         struct intel8x0m *chip = ac97->private_data;
         chip->ac97 = NULL;
 }
 
 
-static int __devinit snd_intel8x0_mixer(struct intel8x0m *chip, int ac97_clock)
+static int __devinit snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock)
 {
         struct snd_ac97_bus *pbus;
         struct snd_ac97_template ac97;
@@ -827,22 +827,22 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0m *chip, int ac97_clock)
         int err;
         unsigned int glob_sta = 0;
         static struct snd_ac97_bus_ops ops = {
-                .write = snd_intel8x0_codec_write,
-                .read = snd_intel8x0_codec_read,
+                .write = snd_intel8x0m_codec_write,
+                .read = snd_intel8x0m_codec_read,
         };
 
         chip->in_ac97_init = 1;
         
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
-        ac97.private_free = snd_intel8x0_mixer_free_ac97;
+        ac97.private_free = snd_intel8x0m_mixer_free_ac97;
         ac97.scaps = AC97_SCAP_SKIP_AUDIO | AC97_SCAP_POWER_SAVE;
 
         glob_sta = igetdword(chip, ICHREG(GLOB_STA));
 
         if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0)
                 goto __err;
-        pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
+        pbus->private_free = snd_intel8x0m_mixer_free_ac97_bus;
         if (ac97_clock >= 8000 && ac97_clock <= 48000)
                 pbus->clock = ac97_clock;
         chip->ac97_bus = pbus;
@@ -894,7 +894,8 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)
         /* finish cold or do warm reset */
         cnt |= (cnt & ICH_AC97COLD) == 0 ? ICH_AC97COLD : ICH_AC97WARM;
         iputdword(chip, ICHREG(GLOB_CNT), cnt);
-        end_time = (jiffies + (HZ / 4)) + 1;
+        usleep_range(500, 1000); /* give warm reset some time */
+        end_time = jiffies + HZ / 4;
         do {
                 if ((igetdword(chip, ICHREG(GLOB_CNT)) & ICH_AC97WARM) == 0)
                         goto __ok;
@@ -959,7 +960,7 @@ static int snd_intel8x0m_ich_chip_init(struct intel8x0m *chip, int probing)
         return 0;
 }
 
-static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)
+static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing)
 {
         unsigned int i;
         int err;
@@ -980,7 +981,7 @@ static int snd_intel8x0_chip_init(struct intel8x0m *chip, int probing)
         return 0;
 }
 
-static int snd_intel8x0_free(struct intel8x0m *chip)
+static int snd_intel8x0m_free(struct intel8x0m *chip)
 {
         unsigned int i;
 
@@ -1045,7 +1046,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
                 return -EIO;
         }
         pci_set_master(pci);
-        if (request_irq(pci->irq, snd_intel8x0_interrupt,
+        if (request_irq(pci->irq, snd_intel8x0m_interrupt,
                         IRQF_SHARED, card->shortname, chip)) {
                 printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
@@ -1053,7 +1054,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
                 return -EIO;
         }
         chip->irq = pci->irq;
-        snd_intel8x0_chip_init(chip, 0);
+        snd_intel8x0m_chip_init(chip, 0);
         snd_ac97_resume(chip->ac97);
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
@@ -1094,10 +1095,10 @@ static void __devinit snd_intel8x0m_proc_init(struct intel8x0m * chip)
 #endif /* CONFIG_PROC_FS */
 
 
-static int snd_intel8x0_dev_free(struct snd_device *device)
+static int snd_intel8x0m_dev_free(struct snd_device *device)
 {
         struct intel8x0m *chip = device->device_data;
-        return snd_intel8x0_free(chip);
+        return snd_intel8x0m_free(chip);
 }
 
 struct ich_reg_info {
@@ -1108,7 +1109,7 @@ struct ich_reg_info {
 static int __devinit snd_intel8x0m_create(struct snd_card *card,
                                          struct pci_dev *pci,
                                          unsigned long device_type,
-                                         struct intel8x0m ** r_intel8x0)
+                                         struct intel8x0m **r_intel8x0m)
 {
         struct intel8x0m *chip;
         int err;
@@ -1116,7 +1117,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         unsigned int int_sta_masks;
         struct ichdev *ichdev;
         static struct snd_device_ops ops = {
-                .dev_free =     snd_intel8x0_dev_free,
+                .dev_free =     snd_intel8x0m_dev_free,
         };
         static struct ich_reg_info intel_regs[2] = {
                 { ICH_MIINT, 0 },
@@ -1124,7 +1125,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         };
         struct ich_reg_info *tbl;
 
-        *r_intel8x0 = NULL;
+        *r_intel8x0m = NULL;
 
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
@@ -1158,7 +1159,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
                 chip->addr = pci_iomap(pci, 0, 0);
         if (!chip->addr) {
                 snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EIO;
         }
         if (pci_resource_flags(pci, 3) & IORESOURCE_MEM) /* ICH4 */
@@ -1167,15 +1168,15 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
                 chip->bmaddr = pci_iomap(pci, 1, 0);
         if (!chip->bmaddr) {
                 snd_printk(KERN_ERR "Controller space ioremap problem\n");
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EIO;
         }
 
  port_inited:
-        if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_SHARED,
+        if (request_irq(pci->irq, snd_intel8x0m_interrupt, IRQF_SHARED,
                         card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -EBUSY;
         }
         chip->irq = pci->irq;
@@ -1210,7 +1211,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                                 chip->bdbars_count * sizeof(u32) * ICH_MAX_FRAGS * 2,
                                 &chip->bdbars) < 0) {
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return -ENOMEM;
         }
         /* tables must be aligned to 8 bytes here, but the kernel pages
@@ -1225,19 +1226,19 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         chip->int_sta_reg = ICH_REG_GLOB_STA;
         chip->int_sta_mask = int_sta_masks;
 
-        if ((err = snd_intel8x0_chip_init(chip, 1)) < 0) {
-                snd_intel8x0_free(chip);
+        if ((err = snd_intel8x0m_chip_init(chip, 1)) < 0) {
+                snd_intel8x0m_free(chip);
                 return err;
         }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
-                snd_intel8x0_free(chip);
+                snd_intel8x0m_free(chip);
                 return err;
         }
 
         snd_card_set_dev(card, &pci->dev);
 
-        *r_intel8x0 = chip;
+        *r_intel8x0m = chip;
         return 0;
 }
 
@@ -1295,11 +1296,11 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
         }
         card->private_data = chip;
 
-        if ((err = snd_intel8x0_mixer(chip, ac97_clock)) < 0) {
+        if ((err = snd_intel8x0m_mixer(chip, ac97_clock)) < 0) {
                 snd_card_free(card);
                 return err;
         }
-        if ((err = snd_intel8x0_pcm(chip)) < 0) {
+        if ((err = snd_intel8x0m_pcm(chip)) < 0) {
                 snd_card_free(card);
                 return err;
         }
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index f5eadfc0672a..a323eafb9e03 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -8,6 +8,21 @@
  *      Modified 2006-06-01 for AES32 support by Remy Bruno
  *                                               <remy.bruno@trinnov.com>
  *
+ *      Modified 2009-04-13 for proper metering by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-14 for native float support by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-26 fixed bug in rms metering by Florian Faber
+ *                                               <faber@faberman.de>
+ *
+ *      Modified 2009-04-30 added hw serial number support by Florian Faber
+ *
+ *      Modified 2011-01-14 added S/PDIF input on RayDATs by Adrian Knoth
+ *
+ *      Modified 2011-01-25 variable period sizes on RayDAT/AIO by Adrian Knoth
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -35,6 +50,7 @@
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
+#include <sound/pcm_params.h>
 #include <sound/info.h>
 #include <sound/asoundef.h>
 #include <sound/rawmidi.h>
@@ -47,15 +63,6 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	  /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;         /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 
-/* Disable precise pointer at start */
-static int precise_ptr[SNDRV_CARDS];
-
-/* Send all playback to line outs */
-static int line_outs_monitor[SNDRV_CARDS];
-
-/* Enable Analog Outs on Channel 63/64 by default */
-static int enable_monitor[SNDRV_CARDS];
-
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for RME HDSPM interface.");
 
@@ -65,42 +72,39 @@ MODULE_PARM_DESC(id, "ID string for RME HDSPM interface.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable/disable specific HDSPM soundcards.");
 
-module_param_array(precise_ptr, bool, NULL, 0444);
-MODULE_PARM_DESC(precise_ptr, "Enable or disable precise pointer.");
-
-module_param_array(line_outs_monitor, bool, NULL, 0444);
-MODULE_PARM_DESC(line_outs_monitor,
-                 "Send playback streams to analog outs by default.");
-
-module_param_array(enable_monitor, bool, NULL, 0444);
-MODULE_PARM_DESC(enable_monitor,
-                 "Enable Analog Out on Channel 63/64 by default.");
 
 MODULE_AUTHOR
-      ("Winfried Ritsch <ritsch_AT_iem.at>, "
-       "Paul Davis <paul@linuxaudiosystems.com>, "
-       "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>, "
-       "Remy Bruno <remy.bruno@trinnov.com>");
+(
+        "Winfried Ritsch <ritsch_AT_iem.at>, "
+        "Paul Davis <paul@linuxaudiosystems.com>, "
+        "Marcus Andersson, Thomas Charbonnel <thomas@undata.org>, "
+        "Remy Bruno <remy.bruno@trinnov.com>, "
+        "Florian Faber <faberman@linuxproaudio.org>, "
+        "Adrian Knoth <adi@drcomp.erfurt.thur.de>"
+);
 MODULE_DESCRIPTION("RME HDSPM");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
-/* --- Write registers. --- 
+/* --- Write registers. ---
   These are defined as byte-offsets from the iobase value.  */
 
+#define HDSPM_WR_SETTINGS             0
+#define HDSPM_outputBufferAddress    32
+#define HDSPM_inputBufferAddress     36
 #define HDSPM_controlRegister        64
 #define HDSPM_interruptConfirmation  96
 #define HDSPM_control2Reg            256  /* not in specs ???????? */
 #define HDSPM_freqReg                256  /* for AES32 */
-#define HDSPM_midiDataOut0           352  /* just believe in old code */
-#define HDSPM_midiDataOut1           356
+#define HDSPM_midiDataOut0           352  /* just believe in old code */
+#define HDSPM_midiDataOut1           356
 #define HDSPM_eeprom_wr              384  /* for AES32 */
 
 /* DMA enable for 64 channels, only Bit 0 is relevant */
-#define HDSPM_outputEnableBase       512  /* 512-767  input  DMA */ 
+#define HDSPM_outputEnableBase       512  /* 512-767  input  DMA */
 #define HDSPM_inputEnableBase        768  /* 768-1023 output DMA */
 
-/* 16 page addresses for each of the 64 channels DMA buffer in and out 
+/* 16 page addresses for each of the 64 channels DMA buffer in and out
    (each 64k=16*4k) Buffer must be 4k aligned (which is default i386 ????) */
 #define HDSPM_pageAddressBufferOut       8192
 #define HDSPM_pageAddressBufferIn        (HDSPM_pageAddressBufferOut+64*16*4)
@@ -119,22 +123,84 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_statusRegister2  192
 #define HDSPM_timecodeRegister 128
 
+/* AIO, RayDAT */
+#define HDSPM_RD_STATUS_0 0
+#define HDSPM_RD_STATUS_1 64
+#define HDSPM_RD_STATUS_2 128
+#define HDSPM_RD_STATUS_3 192
+
+#define HDSPM_RD_TCO           256
+#define HDSPM_RD_PLL_FREQ      512
+#define HDSPM_WR_TCO           128
+
+#define HDSPM_TCO1_TCO_lock                     0x00000001
+#define HDSPM_TCO1_WCK_Input_Range_LSB          0x00000002
+#define HDSPM_TCO1_WCK_Input_Range_MSB          0x00000004
+#define HDSPM_TCO1_LTC_Input_valid              0x00000008
+#define HDSPM_TCO1_WCK_Input_valid              0x00000010
+#define HDSPM_TCO1_Video_Input_Format_NTSC      0x00000020
+#define HDSPM_TCO1_Video_Input_Format_PAL       0x00000040
+
+#define HDSPM_TCO1_set_TC                       0x00000100
+#define HDSPM_TCO1_set_drop_frame_flag          0x00000200
+#define HDSPM_TCO1_LTC_Format_LSB               0x00000400
+#define HDSPM_TCO1_LTC_Format_MSB               0x00000800
+
+#define HDSPM_TCO2_TC_run                       0x00010000
+#define HDSPM_TCO2_WCK_IO_ratio_LSB             0x00020000
+#define HDSPM_TCO2_WCK_IO_ratio_MSB             0x00040000
+#define HDSPM_TCO2_set_num_drop_frames_LSB      0x00080000
+#define HDSPM_TCO2_set_num_drop_frames_MSB      0x00100000
+#define HDSPM_TCO2_set_jam_sync                 0x00200000
+#define HDSPM_TCO2_set_flywheel                 0x00400000
+
+#define HDSPM_TCO2_set_01_4                     0x01000000
+#define HDSPM_TCO2_set_pull_down                0x02000000
+#define HDSPM_TCO2_set_pull_up                  0x04000000
+#define HDSPM_TCO2_set_freq                     0x08000000
+#define HDSPM_TCO2_set_term_75R                 0x10000000
+#define HDSPM_TCO2_set_input_LSB                0x20000000
+#define HDSPM_TCO2_set_input_MSB                0x40000000
+#define HDSPM_TCO2_set_freq_from_app            0x80000000
+
+
+#define HDSPM_midiDataOut0    352
+#define HDSPM_midiDataOut1    356
+#define HDSPM_midiDataOut2    368
+
 #define HDSPM_midiDataIn0     360
 #define HDSPM_midiDataIn1     364
+#define HDSPM_midiDataIn2     372
+#define HDSPM_midiDataIn3     376
 
 /* status is data bytes in MIDI-FIFO (0-128) */
-#define HDSPM_midiStatusOut0  384       
-#define HDSPM_midiStatusOut1  388       
-#define HDSPM_midiStatusIn0   392       
-#define HDSPM_midiStatusIn1   396       
+#define HDSPM_midiStatusOut0  384
+#define HDSPM_midiStatusOut1  388
+#define HDSPM_midiStatusOut2  400
+
+#define HDSPM_midiStatusIn0   392
+#define HDSPM_midiStatusIn1   396
+#define HDSPM_midiStatusIn2   404
+#define HDSPM_midiStatusIn3   408
 
 
 /* the meters are regular i/o-mapped registers, but offset
    considerably from the rest. the peak registers are reset
-   when read; the least-significant 4 bits are full-scale counters; 
+   when read; the least-significant 4 bits are full-scale counters;
    the actual peak value is in the most-significant 24 bits.
 */
-#define HDSPM_MADI_peakrmsbase  4096    /* 4096-8191 2x64x32Bit Meters */
+
+#define HDSPM_MADI_INPUT_PEAK           4096
+#define HDSPM_MADI_PLAYBACK_PEAK        4352
+#define HDSPM_MADI_OUTPUT_PEAK          4608
+
+#define HDSPM_MADI_INPUT_RMS_L          6144
+#define HDSPM_MADI_PLAYBACK_RMS_L       6400
+#define HDSPM_MADI_OUTPUT_RMS_L         6656
+
+#define HDSPM_MADI_INPUT_RMS_H          7168
+#define HDSPM_MADI_PLAYBACK_RMS_H       7424
+#define HDSPM_MADI_OUTPUT_RMS_H         7680
 
 /* --- Control Register bits --------- */
 #define HDSPM_Start                (1<<0) /* start engine */
@@ -143,7 +209,9 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_Latency1             (1<<2) /* where n is defined */
 #define HDSPM_Latency2             (1<<3) /* by Latency{2,1,0} */
 
-#define HDSPM_ClockModeMaster      (1<<4) /* 1=Master, 0=Slave/Autosync */
+#define HDSPM_ClockModeMaster      (1<<4) /* 1=Master, 0=Autosync */
+#define HDSPM_c0Master          0x1    /* Master clock bit in settings
+                                          register [RayDAT, AIO] */
 
 #define HDSPM_AudioInterruptEnable (1<<5) /* what do you think ? */
 
@@ -157,7 +225,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
                                      56channelMODE=0 */ /* MADI ONLY*/
 #define HDSPM_Emphasis    (1<<10) /* Emphasis */ /* AES32 ONLY */
 
-#define HDSPM_AutoInp     (1<<11) /* Auto Input (takeover) == Safe Mode, 
+#define HDSPM_AutoInp     (1<<11) /* Auto Input (takeover) == Safe Mode,
                                      0=off, 1=on  */ /* MADI ONLY */
 #define HDSPM_Dolby       (1<<11) /* Dolby = "NonAudio" ?? */ /* AES32 ONLY */
 
@@ -166,22 +234,23 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
                                     */
 #define HDSPM_InputSelect1 (1<<15) /* should be 0 */
 
-#define HDSPM_SyncRef0     (1<<16) /* 0=WOrd, 1=MADI */
-#define HDSPM_SyncRef1     (1<<17) /* for AES32: SyncRefN codes the AES # */
 #define HDSPM_SyncRef2     (1<<13)
 #define HDSPM_SyncRef3     (1<<25)
 
 #define HDSPM_SMUX         (1<<18) /* Frame ??? */ /* MADI ONY */
-#define HDSPM_clr_tms      (1<<19) /* clear track marker, do not use 
+#define HDSPM_clr_tms      (1<<19) /* clear track marker, do not use
                                       AES additional bits in
                                       lower 5 Audiodatabits ??? */
 #define HDSPM_taxi_reset   (1<<20) /* ??? */ /* MADI ONLY ? */
 #define HDSPM_WCK48        (1<<20) /* Frame ??? = HDSPM_SMUX */ /* AES32 ONLY */
 
-#define HDSPM_Midi0InterruptEnable (1<<22)
-#define HDSPM_Midi1InterruptEnable (1<<23)
+#define HDSPM_Midi0InterruptEnable 0x0400000
+#define HDSPM_Midi1InterruptEnable 0x0800000
+#define HDSPM_Midi2InterruptEnable 0x0200000
+#define HDSPM_Midi3InterruptEnable 0x4000000
 
 #define HDSPM_LineOut (1<<24) /* Analog Out on channel 63/64 on=1, mute=0 */
+#define HDSPe_FLOAT_FORMAT         0x2000000
 
 #define HDSPM_DS_DoubleWire (1<<26) /* AES32 ONLY */
 #define HDSPM_QS_DoubleWire (1<<27) /* AES32 ONLY */
@@ -198,11 +267,18 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_InputCoaxial   (HDSPM_InputSelect0)
 #define HDSPM_SyncRefMask    (HDSPM_SyncRef0|HDSPM_SyncRef1|\
                               HDSPM_SyncRef2|HDSPM_SyncRef3)
-#define HDSPM_SyncRef_Word   0
-#define HDSPM_SyncRef_MADI   (HDSPM_SyncRef0)
 
-#define HDSPM_SYNC_FROM_WORD 0  /* Preferred sync reference */
-#define HDSPM_SYNC_FROM_MADI 1  /* choices - used by "pref_sync_ref" */
+#define HDSPM_c0_SyncRef0      0x2
+#define HDSPM_c0_SyncRef1      0x4
+#define HDSPM_c0_SyncRef2      0x8
+#define HDSPM_c0_SyncRef3      0x10
+#define HDSPM_c0_SyncRefMask   (HDSPM_c0_SyncRef0 | HDSPM_c0_SyncRef1 |\
+                                HDSPM_c0_SyncRef2 | HDSPM_c0_SyncRef3)
+
+#define HDSPM_SYNC_FROM_WORD    0       /* Preferred sync reference */
+#define HDSPM_SYNC_FROM_MADI    1       /* choices - used by "pref_sync_ref" */
+#define HDSPM_SYNC_FROM_TCO     2
+#define HDSPM_SYNC_FROM_SYNC_IN 3
 
 #define HDSPM_Frequency32KHz    HDSPM_Frequency0
 #define HDSPM_Frequency44_1KHz  HDSPM_Frequency1
@@ -216,17 +292,6 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_Frequency192KHz   (HDSPM_QuadSpeed|HDSPM_Frequency1|\
                                  HDSPM_Frequency0)
 
-/* --- for internal discrimination */
-#define HDSPM_CLOCK_SOURCE_AUTOSYNC          0  /* Sample Clock Sources */
-#define HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ    1
-#define HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ  2
-#define HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ    3
-#define HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ    4
-#define HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ  5
-#define HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ    6
-#define HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ   7
-#define HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ 8
-#define HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ   9
 
 /* Synccheck Status */
 #define HDSPM_SYNC_CHECK_NO_LOCK 0
@@ -236,14 +301,16 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 /* AutoSync References - used by "autosync_ref" control switch */
 #define HDSPM_AUTOSYNC_FROM_WORD      0
 #define HDSPM_AUTOSYNC_FROM_MADI      1
-#define HDSPM_AUTOSYNC_FROM_NONE      2
+#define HDSPM_AUTOSYNC_FROM_TCO       2
+#define HDSPM_AUTOSYNC_FROM_SYNC_IN   3
+#define HDSPM_AUTOSYNC_FROM_NONE      4
 
 /* Possible sources of MADI input */
 #define HDSPM_OPTICAL 0         /* optical   */
 #define HDSPM_COAXIAL 1         /* BNC */
 
 #define hdspm_encode_latency(x)       (((x)<<1) & HDSPM_LatencyMask)
-#define hdspm_decode_latency(x)       (((x) & HDSPM_LatencyMask)>>1)
+#define hdspm_decode_latency(x)       ((((x) & HDSPM_LatencyMask)>>1))
 
 #define hdspm_encode_in(x) (((x)&0x3)<<14)
 #define hdspm_decode_in(x) (((x)>>14)&0x3)
@@ -270,13 +337,21 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_AB_int             (1<<2) /* InputChannel Opt=0, Coax=1
                                          * (like inp0)
                                          */
+
 #define HDSPM_madiLock           (1<<3) /* MADI Locked =1, no=0 */
+#define HDSPM_madiSync          (1<<18) /* MADI is in sync */
+
+#define HDSPM_tcoLock    0x00000020 /* Optional TCO locked status FOR HDSPe MADI! */
+#define HDSPM_tcoSync    0x10000000 /* Optional TCO sync status */
+
+#define HDSPM_syncInLock 0x00010000 /* Sync In lock status FOR HDSPe MADI! */
+#define HDSPM_syncInSync 0x00020000 /* Sync In sync status FOR HDSPe MADI! */
 
 #define HDSPM_BufferPositionMask 0x000FFC0 /* Bit 6..15 : h/w buffer pointer */
-                                           /* since 64byte accurate last 6 bits 
-                                              are not used */
+                        /* since 64byte accurate, last 6 bits are not used */
+
+
 
-#define HDSPM_madiSync          (1<<18) /* MADI is in sync */
 #define HDSPM_DoubleSpeedStatus (1<<19) /* (input) card in double speed */
 
 #define HDSPM_madiFreq0         (1<<22) /* system freq 0=error */
@@ -287,8 +362,19 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_BufferID          (1<<26) /* (Double)Buffer ID toggles with
                                          * Interrupt
                                          */
-#define HDSPM_midi0IRQPending   (1<<30) /* MIDI IRQ is pending  */
-#define HDSPM_midi1IRQPending   (1<<31) /* and aktiv */
+#define HDSPM_tco_detect         0x08000000
+#define HDSPM_tco_lock           0x20000000
+
+#define HDSPM_s2_tco_detect      0x00000040
+#define HDSPM_s2_AEBO_D          0x00000080
+#define HDSPM_s2_AEBI_D          0x00000100
+
+
+#define HDSPM_midi0IRQPending    0x40000000
+#define HDSPM_midi1IRQPending    0x80000000
+#define HDSPM_midi2IRQPending    0x20000000
+#define HDSPM_midi2IRQPendingAES 0x00000020
+#define HDSPM_midi3IRQPending    0x00200000
 
 /* --- status bit helpers */
 #define HDSPM_madiFreqMask  (HDSPM_madiFreq0|HDSPM_madiFreq1|\
@@ -317,7 +403,10 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_wc_freq2 (1<<7)   /* 100=64, 101=88.2, 110=96, */
 /* missing Bit   for               111=128, 1000=176.4, 1001=192 */
 
-#define HDSPM_SelSyncRef0 (1<<8)        /* Sync Source in slave mode */
+#define HDSPM_SyncRef0 0x10000  /* Sync Reference */
+#define HDSPM_SyncRef1 0x20000
+
+#define HDSPM_SelSyncRef0 (1<<8)        /* AutoSync Source */
 #define HDSPM_SelSyncRef1 (1<<9)        /* 000=word, 001=MADI, */
 #define HDSPM_SelSyncRef2 (1<<10)       /* 111=no valid signal */
 
@@ -331,11 +420,19 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define HDSPM_wcFreq88_2  (HDSPM_wc_freq0|HDSPM_wc_freq2)
 #define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
 
+#define HDSPM_status1_F_0 0x0400000
+#define HDSPM_status1_F_1 0x0800000
+#define HDSPM_status1_F_2 0x1000000
+#define HDSPM_status1_F_3 0x2000000
+#define HDSPM_status1_freqMask (HDSPM_status1_F_0|HDSPM_status1_F_1|HDSPM_status1_F_2|HDSPM_status1_F_3)
+
 
 #define HDSPM_SelSyncRefMask       (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
                                     HDSPM_SelSyncRef2)
 #define HDSPM_SelSyncRef_WORD      0
 #define HDSPM_SelSyncRef_MADI      (HDSPM_SelSyncRef0)
+#define HDSPM_SelSyncRef_TCO       (HDSPM_SelSyncRef1)
+#define HDSPM_SelSyncRef_SyncIn    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1)
 #define HDSPM_SelSyncRef_NVALID    (HDSPM_SelSyncRef0|HDSPM_SelSyncRef1|\
                                     HDSPM_SelSyncRef2)
 
@@ -345,7 +442,7 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 /* status */
 #define HDSPM_AES32_wcLock      0x0200000
 #define HDSPM_AES32_wcFreq_bit  22
-/* (status >> HDSPM_AES32_wcFreq_bit) & 0xF gives WC frequency (cf function 
+/* (status >> HDSPM_AES32_wcFreq_bit) & 0xF gives WC frequency (cf function
   HDSPM_bit2freq */
 #define HDSPM_AES32_syncref_bit  16
 /* (status >> HDSPM_AES32_syncref_bit) & 0xF gives sync source */
@@ -398,28 +495,348 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 #define MADI_DS_CHANNELS       32
 #define MADI_QS_CHANNELS       16
 
+#define RAYDAT_SS_CHANNELS     36
+#define RAYDAT_DS_CHANNELS     20
+#define RAYDAT_QS_CHANNELS     12
+
+#define AIO_IN_SS_CHANNELS        14
+#define AIO_IN_DS_CHANNELS        10
+#define AIO_IN_QS_CHANNELS        8
+#define AIO_OUT_SS_CHANNELS        16
+#define AIO_OUT_DS_CHANNELS        12
+#define AIO_OUT_QS_CHANNELS        10
+
+#define AES32_CHANNELS          16
+
 /* the size of a substream (1 mono data stream) */
 #define HDSPM_CHANNEL_BUFFER_SAMPLES  (16*1024)
 #define HDSPM_CHANNEL_BUFFER_BYTES    (4*HDSPM_CHANNEL_BUFFER_SAMPLES)
 
 /* the size of the area we need to allocate for DMA transfers. the
    size is the same regardless of the number of channels, and
-   also the latency to use. 
+   also the latency to use.
    for one direction !!!
 */
 #define HDSPM_DMA_AREA_BYTES (HDSPM_MAX_CHANNELS * HDSPM_CHANNEL_BUFFER_BYTES)
 #define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
 
 /* revisions >= 230 indicate AES32 card */
-#define HDSPM_AESREVISION 230
+#define HDSPM_MADI_REV          210
+#define HDSPM_RAYDAT_REV        211
+#define HDSPM_AIO_REV           212
+#define HDSPM_MADIFACE_REV      213
+#define HDSPM_AES_REV           240
+#define HDSPM_AES32_REV         234
+#define HDSPM_AES32_OLD_REV     233
 
 /* speed factor modes */
 #define HDSPM_SPEED_SINGLE 0
 #define HDSPM_SPEED_DOUBLE 1
 #define HDSPM_SPEED_QUAD   2
+
 /* names for speed modes */
 static char *hdspm_speed_names[] = { "single", "double", "quad" };
 
+static char *texts_autosync_aes_tco[] = { "Word Clock",
+                                          "AES1", "AES2", "AES3", "AES4",
+                                          "AES5", "AES6", "AES7", "AES8",
+                                          "TCO" };
+static char *texts_autosync_aes[] = { "Word Clock",
+                                      "AES1", "AES2", "AES3", "AES4",
+                                      "AES5", "AES6", "AES7", "AES8" };
+static char *texts_autosync_madi_tco[] = { "Word Clock",
+                                           "MADI", "TCO", "Sync In" };
+static char *texts_autosync_madi[] = { "Word Clock",
+                                       "MADI", "Sync In" };
+
+static char *texts_autosync_raydat_tco[] = {
+        "Word Clock",
+        "ADAT 1", "ADAT 2", "ADAT 3", "ADAT 4",
+        "AES", "SPDIF", "TCO", "Sync In"
+};
+static char *texts_autosync_raydat[] = {
+        "Word Clock",
+        "ADAT 1", "ADAT 2", "ADAT 3", "ADAT 4",
+        "AES", "SPDIF", "Sync In"
+};
+static char *texts_autosync_aio_tco[] = {
+        "Word Clock",
+        "ADAT", "AES", "SPDIF", "TCO", "Sync In"
+};
+static char *texts_autosync_aio[] = { "Word Clock",
+                                      "ADAT", "AES", "SPDIF", "Sync In" };
+
+static char *texts_freq[] = {
+        "No Lock",
+        "32 kHz",
+        "44.1 kHz",
+        "48 kHz",
+        "64 kHz",
+        "88.2 kHz",
+        "96 kHz",
+        "128 kHz",
+        "176.4 kHz",
+        "192 kHz"
+};
+
+static char *texts_ports_madi[] = {
+        "MADI.1", "MADI.2", "MADI.3", "MADI.4", "MADI.5", "MADI.6",
+        "MADI.7", "MADI.8", "MADI.9", "MADI.10", "MADI.11", "MADI.12",
+        "MADI.13", "MADI.14", "MADI.15", "MADI.16", "MADI.17", "MADI.18",
+        "MADI.19", "MADI.20", "MADI.21", "MADI.22", "MADI.23", "MADI.24",
+        "MADI.25", "MADI.26", "MADI.27", "MADI.28", "MADI.29", "MADI.30",
+        "MADI.31", "MADI.32", "MADI.33", "MADI.34", "MADI.35", "MADI.36",
+        "MADI.37", "MADI.38", "MADI.39", "MADI.40", "MADI.41", "MADI.42",
+        "MADI.43", "MADI.44", "MADI.45", "MADI.46", "MADI.47", "MADI.48",
+        "MADI.49", "MADI.50", "MADI.51", "MADI.52", "MADI.53", "MADI.54",
+        "MADI.55", "MADI.56", "MADI.57", "MADI.58", "MADI.59", "MADI.60",
+        "MADI.61", "MADI.62", "MADI.63", "MADI.64",
+};
+
+
+static char *texts_ports_raydat_ss[] = {
+        "ADAT1.1", "ADAT1.2", "ADAT1.3", "ADAT1.4", "ADAT1.5", "ADAT1.6",
+        "ADAT1.7", "ADAT1.8", "ADAT2.1", "ADAT2.2", "ADAT2.3", "ADAT2.4",
+        "ADAT2.5", "ADAT2.6", "ADAT2.7", "ADAT2.8", "ADAT3.1", "ADAT3.2",
+        "ADAT3.3", "ADAT3.4", "ADAT3.5", "ADAT3.6", "ADAT3.7", "ADAT3.8",
+        "ADAT4.1", "ADAT4.2", "ADAT4.3", "ADAT4.4", "ADAT4.5", "ADAT4.6",
+        "ADAT4.7", "ADAT4.8",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+static char *texts_ports_raydat_ds[] = {
+        "ADAT1.1", "ADAT1.2", "ADAT1.3", "ADAT1.4",
+        "ADAT2.1", "ADAT2.2", "ADAT2.3", "ADAT2.4",
+        "ADAT3.1", "ADAT3.2", "ADAT3.3", "ADAT3.4",
+        "ADAT4.1", "ADAT4.2", "ADAT4.3", "ADAT4.4",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+static char *texts_ports_raydat_qs[] = {
+        "ADAT1.1", "ADAT1.2",
+        "ADAT2.1", "ADAT2.2",
+        "ADAT3.1", "ADAT3.2",
+        "ADAT4.1", "ADAT4.2",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R"
+};
+
+
+static char *texts_ports_aio_in_ss[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4", "ADAT.5", "ADAT.6",
+        "ADAT.7", "ADAT.8"
+};
+
+static char *texts_ports_aio_out_ss[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4", "ADAT.5", "ADAT.6",
+        "ADAT.7", "ADAT.8",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aio_in_ds[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4"
+};
+
+static char *texts_ports_aio_out_ds[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aio_in_qs[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4"
+};
+
+static char *texts_ports_aio_out_qs[] = {
+        "Analogue.L", "Analogue.R",
+        "AES.L", "AES.R",
+        "SPDIF.L", "SPDIF.R",
+        "ADAT.1", "ADAT.2", "ADAT.3", "ADAT.4",
+        "Phone.L", "Phone.R"
+};
+
+static char *texts_ports_aes32[] = {
+        "AES.1", "AES.2", "AES.3", "AES.4", "AES.5", "AES.6", "AES.7",
+        "AES.8", "AES.9.", "AES.10", "AES.11", "AES.12", "AES.13", "AES.14",
+        "AES.15", "AES.16"
+};
+
+/* These tables map the ALSA channels 1..N to the channels that we
+   need to use in order to find the relevant channel buffer. RME
+   refers to this kind of mapping as between "the ADAT channel and
+   the DMA channel." We index it using the logical audio channel,
+   and the value is the DMA channel (i.e. channel buffer number)
+   where the data for that channel can be read/written from/to.
+*/
+
+static char channel_map_unity_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15,
+        16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31,
+        32, 33, 34, 35, 36, 37, 38, 39,
+        40, 41, 42, 43, 44, 45, 46, 47,
+        48, 49, 50, 51, 52, 53, 54, 55,
+        56, 57, 58, 59, 60, 61, 62, 63
+};
+
+static char channel_map_raydat_ss[HDSPM_MAX_CHANNELS] = {
+        4, 5, 6, 7, 8, 9, 10, 11,       /* ADAT 1 */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT 2 */
+        20, 21, 22, 23, 24, 25, 26, 27, /* ADAT 3 */
+        28, 29, 30, 31, 32, 33, 34, 35, /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_raydat_ds[HDSPM_MAX_CHANNELS] = {
+        4, 5, 6, 7,             /* ADAT 1 */
+        8, 9, 10, 11,           /* ADAT 2 */
+        12, 13, 14, 15,         /* ADAT 3 */
+        16, 17, 18, 19,         /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_raydat_qs[HDSPM_MAX_CHANNELS] = {
+        4, 5,                   /* ADAT 1 */
+        6, 7,                   /* ADAT 2 */
+        8, 9,                   /* ADAT 3 */
+        10, 11,                 /* ADAT 4 */
+        0, 1,                   /* AES */
+        2, 3,                   /* SPDIF */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_in_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in, */
+        10, 11,                 /* spdif in */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT in */
+        -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_out_ss[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 13, 14, 15, 16, 17, 18, 19, /* ADAT out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+};
+
+static char channel_map_aio_in_ds[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in */
+        10, 11,                 /* spdif in */
+        12, 14, 16, 18,         /* adat in */
+        -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_out_ds[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 14, 16, 18,         /* adat out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_in_qs[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line in */
+        8, 9,                   /* aes in */
+        10, 11,                 /* spdif in */
+        12, 16,                 /* adat in */
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aio_out_qs[HDSPM_MAX_CHANNELS] = {
+        0, 1,                   /* line out */
+        8, 9,                   /* aes out */
+        10, 11,                 /* spdif out */
+        12, 16,                 /* adat out */
+        6, 7,                   /* phone out */
+        -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static char channel_map_aes32[HDSPM_MAX_CHANNELS] = {
+        0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1
+};
+
 struct hdspm_midi {
         struct hdspm *hdspm;
         int id;
@@ -430,6 +847,21 @@ struct hdspm_midi {
         struct timer_list timer;
         spinlock_t lock;
         int pending;
+        int dataIn;
+        int statusIn;
+        int dataOut;
+        int statusOut;
+        int ie;
+        int irq;
+};
+
+struct hdspm_tco {
+        int input;
+        int framerate;
+        int wordclock;
+        int samplerate;
+        int pull;
+        int term; /* 0 = off, 1 = on */
 };
 
 struct hdspm {
@@ -441,21 +873,39 @@ struct hdspm {
         char *card_name;             /* for procinfo */
         unsigned short firmware_rev; /* dont know if relevant (yes if AES32)*/
 
-        unsigned char is_aes32;    /* indicates if card is AES32 */
+        uint8_t io_type;
 
-        int precise_ptr;        /* use precise pointers, to be tested */
         int monitor_outs;       /* set up monitoring outs init flag */
 
         u32 control_register;   /* cached value */
         u32 control2_register;  /* cached value */
+        u32 settings_register;
 
-        struct hdspm_midi midi[2];
+        struct hdspm_midi midi[4];
         struct tasklet_struct midi_tasklet;
 
         size_t period_bytes;
-        unsigned char ss_channels;      /* channels of card in single speed */
-        unsigned char ds_channels;      /* Double Speed */
-        unsigned char qs_channels;      /* Quad Speed */
+        unsigned char ss_in_channels;
+        unsigned char ds_in_channels;
+        unsigned char qs_in_channels;
+        unsigned char ss_out_channels;
+        unsigned char ds_out_channels;
+        unsigned char qs_out_channels;
+
+        unsigned char max_channels_in;
+        unsigned char max_channels_out;
+
+        char *channel_map_in;
+        char *channel_map_out;
+
+        char *channel_map_in_ss, *channel_map_in_ds, *channel_map_in_qs;
+        char *channel_map_out_ss, *channel_map_out_ds, *channel_map_out_qs;
+
+        char **port_names_in;
+        char **port_names_out;
+
+        char **port_names_in_ss, **port_names_in_ds, **port_names_in_qs;
+        char **port_names_out_ss, **port_names_out_ds, **port_names_out_qs;
 
         unsigned char *playback_buffer; /* suitably aligned address */
         unsigned char *capture_buffer;  /* suitably aligned address */
@@ -468,14 +918,13 @@ struct hdspm {
         int last_internal_sample_rate;
         int system_sample_rate;
 
-        char *channel_map;      /* channel map for DS and Quadspeed */
-
         int dev;                /* Hardware vars... */
         int irq;
         unsigned long port;
         void __iomem *iobase;
 
         int irq_count;          /* for debug */
+        int midiPorts;
 
         struct snd_card *card;  /* one card */
         struct snd_pcm *pcm;            /* has one pcm */
@@ -487,28 +936,17 @@ struct hdspm {
         struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS];
         /* but input to much, so not used */
         struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS];
-        /* full mixer accessible over mixer ioctl or hwdep-device */
+        /* full mixer accessable over mixer ioctl or hwdep-device */
         struct hdspm_mixer *mixer;
 
-};
+        struct hdspm_tco *tco;  /* NULL if no TCO detected */
 
-/* These tables map the ALSA channels 1..N to the channels that we
-   need to use in order to find the relevant channel buffer. RME
-   refer to this kind of mapping as between "the ADAT channel and
-   the DMA channel." We index it using the logical audio channel,
-   and the value is the DMA channel (i.e. channel buffer number)
-   where the data for that channel can be read/written from/to.
-*/
+        char **texts_autosync;
+        int texts_autosync_items;
+
+        cycles_t last_interrupt;
 
-static char channel_map_madi_ss[HDSPM_MAX_CHANNELS] = {
-   0, 1, 2, 3, 4, 5, 6, 7,
-   8, 9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63
+        struct hdspm_peak_rms peak_rms;
 };
 
 
@@ -532,11 +970,11 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
 static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
                                           struct hdspm * hdspm);
 
-static inline void snd_hdspm_initialize_midi_flush(struct hdspm * hdspm);
-static int hdspm_update_simple_mixer_controls(struct hdspm * hdspm);
-static int hdspm_autosync_ref(struct hdspm * hdspm);
-static int snd_hdspm_set_defaults(struct hdspm * hdspm);
-static void hdspm_set_sgbuf(struct hdspm * hdspm,
+static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm);
+static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);
+static int hdspm_autosync_ref(struct hdspm *hdspm);
+static int snd_hdspm_set_defaults(struct hdspm *hdspm);
+static void hdspm_set_sgbuf(struct hdspm *hdspm,
                             struct snd_pcm_substream *substream,
                              unsigned int reg, int channels);
 
@@ -550,7 +988,7 @@ static inline int HDSPM_bit2freq(int n)
         return bit2freq_tab[n];
 }
 
-/* Write/read to/from HDSPM with Addresses in Bytes
+/* Write/read to/from HDSPM with Adresses in Bytes
    not words but only 32Bit writes are allowed */
 
 static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg,
@@ -564,8 +1002,8 @@ static inline unsigned int hdspm_read(struct hdspm * hdspm, unsigned int reg)
         return readl(hdspm->iobase + reg);
 }
 
-/* for each output channel (chan) I have an Input (in) and Playback (pb) Fader 
-   mixer is write only on hardware so we have to cache him for read 
+/* for each output channel (chan) I have an Input (in) and Playback (pb) Fader
+   mixer is write only on hardware so we have to cache him for read
    each fader is a u32, but uses only the first 16 bit */
 
 static inline int hdspm_read_in_gain(struct hdspm * hdspm, unsigned int chan,
@@ -641,30 +1079,67 @@ static int snd_hdspm_use_is_exclusive(struct hdspm *hdspm)
 /* check for external sample rate */
 static int hdspm_external_sample_rate(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
-                unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-                unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int timecode =
-                        hdspm_read(hdspm, HDSPM_timecodeRegister);
+        unsigned int status, status2, timecode;
+        int syncref, rate = 0, rate_bits;
 
-                int syncref = hdspm_autosync_ref(hdspm);
+        switch (hdspm->io_type) {
+        case AES32:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                timecode = hdspm_read(hdspm, HDSPM_timecodeRegister);
+
+                syncref = hdspm_autosync_ref(hdspm);
 
                 if (syncref == HDSPM_AES32_AUTOSYNC_FROM_WORD &&
                                 status & HDSPM_AES32_wcLock)
-                        return HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit)
-                                              & 0xF);
+                        return HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF);
+
                 if (syncref >= HDSPM_AES32_AUTOSYNC_FROM_AES1 &&
-                        syncref <= HDSPM_AES32_AUTOSYNC_FROM_AES8 &&
-                        status2 & (HDSPM_LockAES >>
-                                  (syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1)))
-                        return HDSPM_bit2freq((timecode >>
-                          (4*(syncref-HDSPM_AES32_AUTOSYNC_FROM_AES1))) & 0xF);
+                                syncref <= HDSPM_AES32_AUTOSYNC_FROM_AES8 &&
+                                status2 & (HDSPM_LockAES >>
+                                (syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1)))
+                        return HDSPM_bit2freq((timecode >> (4*(syncref-HDSPM_AES32_AUTOSYNC_FROM_AES1))) & 0xF);
                 return 0;
-        } else {
-                unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-                unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int rate_bits;
-                int rate = 0;
+                break;
+
+        case MADIface:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+
+                if (!(status & HDSPM_madiLock)) {
+                        rate = 0;  /* no lock */
+                } else {
+                        switch (status & (HDSPM_status1_freqMask)) {
+                        case HDSPM_status1_F_0*1:
+                                rate = 32000; break;
+                        case HDSPM_status1_F_0*2:
+                                rate = 44100; break;
+                        case HDSPM_status1_F_0*3:
+                                rate = 48000; break;
+                        case HDSPM_status1_F_0*4:
+                                rate = 64000; break;
+                        case HDSPM_status1_F_0*5:
+                                rate = 88200; break;
+                        case HDSPM_status1_F_0*6:
+                                rate = 96000; break;
+                        case HDSPM_status1_F_0*7:
+                                rate = 128000; break;
+                        case HDSPM_status1_F_0*8:
+                                rate = 176400; break;
+                        case HDSPM_status1_F_0*9:
+                                rate = 192000; break;
+                        default:
+                                rate = 0; break;
+                        }
+                }
+
+                break;
+
+        case MADI:
+        case AIO:
+        case RayDAT:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                rate = 0;
 
                 /* if wordclock has synced freq and wordclock is valid */
                 if ((status2 & HDSPM_wcLock) != 0 &&
@@ -672,6 +1147,7 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
 
                         rate_bits = status2 & HDSPM_wcFreqMask;
 
+
                         switch (rate_bits) {
                         case HDSPM_wcFreq32:
                                 rate = 32000;
@@ -691,7 +1167,6 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                         case HDSPM_wcFreq96:
                                 rate = 96000;
                                 break;
-                                /* Quadspeed Bit missing ???? */
                         default:
                                 rate = 0;
                                 break;
@@ -702,10 +1177,10 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                  * word has priority to MADI
                  */
                 if (rate != 0 &&
-                    (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
+                (status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
                         return rate;
 
-                /* maby a madi input (which is taken if sel sync is madi) */
+                /* maybe a madi input (which is taken if sel sync is madi) */
                 if (status & HDSPM_madiLock) {
                         rate_bits = status & HDSPM_madiFreqMask;
 
@@ -742,36 +1217,35 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                                 break;
                         }
                 }
-                return rate;
+                break;
         }
+
+        return rate;
 }
 
 /* Latency function */
-static inline void hdspm_compute_period_size(struct hdspm * hdspm)
+static inline void hdspm_compute_period_size(struct hdspm *hdspm)
 {
-        hdspm->period_bytes =
-            1 << ((hdspm_decode_latency(hdspm->control_register) + 8));
+        hdspm->period_bytes = 1 << ((hdspm_decode_latency(hdspm->control_register) + 8));
 }
 
-static snd_pcm_uframes_t hdspm_hw_pointer(struct hdspm * hdspm)
+
+static snd_pcm_uframes_t hdspm_hw_pointer(struct hdspm *hdspm)
 {
         int position;
 
         position = hdspm_read(hdspm, HDSPM_statusRegister);
 
-        if (!hdspm->precise_ptr)
-                return (position & HDSPM_BufferID) ?
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                position &= HDSPM_BufferPositionMask;
+                position /= 4; /* Bytes per sample */
+                break;
+        default:
+                position = (position & HDSPM_BufferID) ?
                         (hdspm->period_bytes / 4) : 0;
-
-        /* hwpointer comes in bytes and is 64Bytes accurate (by docu since
-           PCI Burst)
-           i have experimented that it is at most 64 Byte to much for playing 
-           so substraction of 64 byte should be ok for ALSA, but use it only
-           for application where you know what you do since if you come to
-           near with record pointer it can be a disaster */
-
-        position &= HDSPM_BufferPositionMask;
-        position = ((position - 64) % (2 * hdspm->period_bytes)) / 4;
+        }
 
         return position;
 }
@@ -805,7 +1279,7 @@ static void hdspm_silence_playback(struct hdspm *hdspm)
         }
 }
 
-static int hdspm_set_interrupt_interval(struct hdspm * s, unsigned int frames)
+static int hdspm_set_interrupt_interval(struct hdspm *s, unsigned int frames)
 {
         int n;
 
@@ -829,21 +1303,53 @@ static int hdspm_set_interrupt_interval(struct hdspm * s, unsigned int frames)
         return 0;
 }
 
+static u64 hdspm_calc_dds_value(struct hdspm *hdspm, u64 period)
+{
+        u64 freq_const;
+
+        if (period == 0)
+                return 0;
+
+        switch (hdspm->io_type) {
+        case MADI:
+        case AES32:
+                freq_const = 110069313433624ULL;
+                break;
+        case RayDAT:
+        case AIO:
+                freq_const = 104857600000000ULL;
+                break;
+        case MADIface:
+                freq_const = 131072000000000ULL;
+        }
+
+        return div_u64(freq_const, period);
+}
+
+
 static void hdspm_set_dds_value(struct hdspm *hdspm, int rate)
 {
         u64 n;
-        
+
         if (rate >= 112000)
                 rate /= 4;
         else if (rate >= 56000)
                 rate /= 2;
 
-        /* RME says n = 104857600000000, but in the windows MADI driver, I see:
-//      return 104857600000000 / rate; // 100 MHz
-        return 110100480000000 / rate; // 105 MHz
-        */         
-        /* n = 104857600000000ULL; */ /*  =  2^20 * 10^8 */
-        n = 110100480000000ULL;    /* Value checked for AES32 and MADI */
+        switch (hdspm->io_type) {
+        case MADIface:
+          n = 131072000000000ULL;  /* 125 MHz */
+          break;
+        case MADI:
+        case AES32:
+          n = 110069313433624ULL;  /* 105 MHz */
+          break;
+        case RayDAT:
+        case AIO:
+          n = 104857600000000ULL;  /* 100 MHz */
+          break;
+        }
+
         n = div_u64(n, rate);
         /* n should be less than 2^32 for being written to FREQ register */
         snd_BUG_ON(n >> 32);
@@ -864,13 +1370,13 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 
         if (!(hdspm->control_register & HDSPM_ClockModeMaster)) {
 
-                /* SLAVE --- */ 
+                /* SLAVE --- */
                 if (called_internally) {
 
-                  /* request from ctl or card initialization 
-                     just make a warning an remember setting 
-                     for future master mode switching */
-    
+                        /* request from ctl or card initialization
+                           just make a warning an remember setting
+                           for future master mode switching */
+
                         snd_printk(KERN_WARNING "HDSPM: "
                                    "Warning: device is not running "
                                    "as a clock master.\n");
@@ -907,7 +1413,7 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
 
            Note that a similar but essentially insoluble problem exists for
            externally-driven rate changes. All we can do is to flag rate
-           changes in the read/write routines.  
+           changes in the read/write routines.
          */
 
         if (current_rate <= 48000)
@@ -975,16 +1481,35 @@ static int hdspm_set_rate(struct hdspm * hdspm, int rate, int called_internally)
         /* For AES32, need to set DDS value in FREQ register
            For MADI, also apparently */
         hdspm_set_dds_value(hdspm, rate);
-        
-        if (hdspm->is_aes32 && rate != current_rate)
+
+        if (AES32 == hdspm->io_type && rate != current_rate)
                 hdspm_write(hdspm, HDSPM_eeprom_wr, 0);
-        
-        /* For AES32 and for MADI (at least rev 204), channel_map needs to
-         * always be channel_map_madi_ss, whatever the sample rate */
-        hdspm->channel_map = channel_map_madi_ss;
 
         hdspm->system_sample_rate = rate;
 
+        if (rate <= 48000) {
+                hdspm->channel_map_in = hdspm->channel_map_in_ss;
+                hdspm->channel_map_out = hdspm->channel_map_out_ss;
+                hdspm->max_channels_in = hdspm->ss_in_channels;
+                hdspm->max_channels_out = hdspm->ss_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_ss;
+                hdspm->port_names_out = hdspm->port_names_out_ss;
+        } else if (rate <= 96000) {
+                hdspm->channel_map_in = hdspm->channel_map_in_ds;
+                hdspm->channel_map_out = hdspm->channel_map_out_ds;
+                hdspm->max_channels_in = hdspm->ds_in_channels;
+                hdspm->max_channels_out = hdspm->ds_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_ds;
+                hdspm->port_names_out = hdspm->port_names_out_ds;
+        } else {
+                hdspm->channel_map_in = hdspm->channel_map_in_qs;
+                hdspm->channel_map_out = hdspm->channel_map_out_qs;
+                hdspm->max_channels_in = hdspm->qs_in_channels;
+                hdspm->max_channels_out = hdspm->qs_out_channels;
+                hdspm->port_names_in = hdspm->port_names_in_qs;
+                hdspm->port_names_out = hdspm->port_names_out_qs;
+        }
+
         if (not_set != 0)
                 return -1;
 
@@ -1019,39 +1544,26 @@ static inline unsigned char snd_hdspm_midi_read_byte (struct hdspm *hdspm,
                                                       int id)
 {
         /* the hardware already does the relevant bit-mask with 0xff */
-        if (id)
-                return hdspm_read(hdspm, HDSPM_midiDataIn1);
-        else
-                return hdspm_read(hdspm, HDSPM_midiDataIn0);
+        return hdspm_read(hdspm, hdspm->midi[id].dataIn);
 }
 
 static inline void snd_hdspm_midi_write_byte (struct hdspm *hdspm, int id,
                                               int val)
 {
         /* the hardware already does the relevant bit-mask with 0xff */
-        if (id)
-                hdspm_write(hdspm, HDSPM_midiDataOut1, val);
-        else
-                hdspm_write(hdspm, HDSPM_midiDataOut0, val);
+        return hdspm_write(hdspm, hdspm->midi[id].dataOut, val);
 }
 
 static inline int snd_hdspm_midi_input_available (struct hdspm *hdspm, int id)
 {
-        if (id)
-                return (hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff);
-        else
-                return (hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff);
+        return hdspm_read(hdspm, hdspm->midi[id].statusIn) & 0xFF;
 }
 
 static inline int snd_hdspm_midi_output_possible (struct hdspm *hdspm, int id)
 {
         int fifo_bytes_used;
 
-        if (id)
-                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut1);
-        else
-                fifo_bytes_used = hdspm_read(hdspm, HDSPM_midiStatusOut0);
-        fifo_bytes_used &= 0xff;
+        fifo_bytes_used = hdspm_read(hdspm, hdspm->midi[id].statusOut) & 0xFF;
 
         if (fifo_bytes_used < 128)
                 return  128 - fifo_bytes_used;
@@ -1074,7 +1586,7 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
         unsigned char buf[128];
 
         /* Output is not interrupt driven */
-                
+
         spin_lock_irqsave (&hmidi->lock, flags);
         if (hmidi->output &&
             !snd_rawmidi_transmit_empty (hmidi->output)) {
@@ -1083,11 +1595,11 @@ static int snd_hdspm_midi_output_write (struct hdspm_midi *hmidi)
                 if (n_pending > 0) {
                         if (n_pending > (int)sizeof (buf))
                                 n_pending = sizeof (buf);
-                
+
                         to_write = snd_rawmidi_transmit (hmidi->output, buf,
                                                          n_pending);
                         if (to_write > 0) {
-                                for (i = 0; i < to_write; ++i) 
+                                for (i = 0; i < to_write; ++i)
                                         snd_hdspm_midi_write_byte (hmidi->hdspm,
                                                                    hmidi->id,
                                                                    buf[i]);
@@ -1127,12 +1639,11 @@ static int snd_hdspm_midi_input_read (struct hdspm_midi *hmidi)
                 }
         }
         hmidi->pending = 0;
-        if (hmidi->id)
-                hmidi->hdspm->control_register |= HDSPM_Midi1InterruptEnable;
-        else
-                hmidi->hdspm->control_register |= HDSPM_Midi0InterruptEnable;
+
+        hmidi->hdspm->control_register |= hmidi->ie;
         hdspm_write(hmidi->hdspm, HDSPM_controlRegister,
                     hmidi->hdspm->control_register);
+
         spin_unlock_irqrestore (&hmidi->lock, flags);
         return snd_hdspm_midi_output_write (hmidi);
 }
@@ -1143,20 +1654,18 @@ snd_hdspm_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
         struct hdspm *hdspm;
         struct hdspm_midi *hmidi;
         unsigned long flags;
-        u32 ie;
 
         hmidi = substream->rmidi->private_data;
         hdspm = hmidi->hdspm;
-        ie = hmidi->id ?
-                HDSPM_Midi1InterruptEnable : HDSPM_Midi0InterruptEnable;
+
         spin_lock_irqsave (&hdspm->lock, flags);
         if (up) {
-                if (!(hdspm->control_register & ie)) {
+                if (!(hdspm->control_register & hmidi->ie)) {
                         snd_hdspm_flush_midi_input (hdspm, hmidi->id);
-                        hdspm->control_register |= ie;
+                        hdspm->control_register |= hmidi->ie;
                 }
         } else {
-                hdspm->control_register &= ~ie;
+                hdspm->control_register &= ~hmidi->ie;
         }
 
         hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
@@ -1167,14 +1676,14 @@ static void snd_hdspm_midi_output_timer(unsigned long data)
 {
         struct hdspm_midi *hmidi = (struct hdspm_midi *) data;
         unsigned long flags;
-        
+
         snd_hdspm_midi_output_write(hmidi);
         spin_lock_irqsave (&hmidi->lock, flags);
 
         /* this does not bump hmidi->istimer, because the
            kernel automatically removed the timer when it
            expired, and we are now adding it back, thus
-           leaving istimer wherever it was set before.  
+           leaving istimer wherever it was set before.
         */
 
         if (hmidi->istimer) {
@@ -1288,22 +1797,103 @@ static int __devinit snd_hdspm_create_midi (struct snd_card *card,
         hdspm->midi[id].hdspm = hdspm;
         spin_lock_init (&hdspm->midi[id].lock);
 
-        sprintf (buf, "%s MIDI %d", card->shortname, id+1);
-        err = snd_rawmidi_new (card, buf, id, 1, 1, &hdspm->midi[id].rmidi);
-        if (err < 0)
-                return err;
+        if (0 == id) {
+                if (MADIface == hdspm->io_type) {
+                        /* MIDI-over-MADI on HDSPe MADIface */
+                        hdspm->midi[0].dataIn = HDSPM_midiDataIn2;
+                        hdspm->midi[0].statusIn = HDSPM_midiStatusIn2;
+                        hdspm->midi[0].dataOut = HDSPM_midiDataOut2;
+                        hdspm->midi[0].statusOut = HDSPM_midiStatusOut2;
+                        hdspm->midi[0].ie = HDSPM_Midi2InterruptEnable;
+                        hdspm->midi[0].irq = HDSPM_midi2IRQPending;
+                } else {
+                        hdspm->midi[0].dataIn = HDSPM_midiDataIn0;
+                        hdspm->midi[0].statusIn = HDSPM_midiStatusIn0;
+                        hdspm->midi[0].dataOut = HDSPM_midiDataOut0;
+                        hdspm->midi[0].statusOut = HDSPM_midiStatusOut0;
+                        hdspm->midi[0].ie = HDSPM_Midi0InterruptEnable;
+                        hdspm->midi[0].irq = HDSPM_midi0IRQPending;
+                }
+        } else if (1 == id) {
+                hdspm->midi[1].dataIn = HDSPM_midiDataIn1;
+                hdspm->midi[1].statusIn = HDSPM_midiStatusIn1;
+                hdspm->midi[1].dataOut = HDSPM_midiDataOut1;
+                hdspm->midi[1].statusOut = HDSPM_midiStatusOut1;
+                hdspm->midi[1].ie = HDSPM_Midi1InterruptEnable;
+                hdspm->midi[1].irq = HDSPM_midi1IRQPending;
+        } else if ((2 == id) && (MADI == hdspm->io_type)) {
+                /* MIDI-over-MADI on HDSPe MADI */
+                hdspm->midi[2].dataIn = HDSPM_midiDataIn2;
+                hdspm->midi[2].statusIn = HDSPM_midiStatusIn2;
+                hdspm->midi[2].dataOut = HDSPM_midiDataOut2;
+                hdspm->midi[2].statusOut = HDSPM_midiStatusOut2;
+                hdspm->midi[2].ie = HDSPM_Midi2InterruptEnable;
+                hdspm->midi[2].irq = HDSPM_midi2IRQPending;
+        } else if (2 == id) {
+                /* TCO MTC, read only */
+                hdspm->midi[2].dataIn = HDSPM_midiDataIn2;
+                hdspm->midi[2].statusIn = HDSPM_midiStatusIn2;
+                hdspm->midi[2].dataOut = -1;
+                hdspm->midi[2].statusOut = -1;
+                hdspm->midi[2].ie = HDSPM_Midi2InterruptEnable;
+                hdspm->midi[2].irq = HDSPM_midi2IRQPendingAES;
+        } else if (3 == id) {
+                /* TCO MTC on HDSPe MADI */
+                hdspm->midi[3].dataIn = HDSPM_midiDataIn3;
+                hdspm->midi[3].statusIn = HDSPM_midiStatusIn3;
+                hdspm->midi[3].dataOut = -1;
+                hdspm->midi[3].statusOut = -1;
+                hdspm->midi[3].ie = HDSPM_Midi3InterruptEnable;
+                hdspm->midi[3].irq = HDSPM_midi3IRQPending;
+        }
 
-        sprintf(hdspm->midi[id].rmidi->name, "HDSPM MIDI %d", id+1);
-        hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+        if ((id < 2) || ((2 == id) && ((MADI == hdspm->io_type) ||
+                                        (MADIface == hdspm->io_type)))) {
+                if ((id == 0) && (MADIface == hdspm->io_type)) {
+                        sprintf(buf, "%s MIDIoverMADI", card->shortname);
+                } else if ((id == 2) && (MADI == hdspm->io_type)) {
+                        sprintf(buf, "%s MIDIoverMADI", card->shortname);
+                } else {
+                        sprintf(buf, "%s MIDI %d", card->shortname, id+1);
+                }
+                err = snd_rawmidi_new(card, buf, id, 1, 1,
+                                &hdspm->midi[id].rmidi);
+                if (err < 0)
+                        return err;
 
-        snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
-                            &snd_hdspm_midi_output);
-        snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
-                            &snd_hdspm_midi_input);
+                sprintf(hdspm->midi[id].rmidi->name, "%s MIDI %d",
+                                card->id, id+1);
+                hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_OUTPUT,
+                                &snd_hdspm_midi_output);
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_INPUT,
+                                &snd_hdspm_midi_input);
+
+                hdspm->midi[id].rmidi->info_flags |=
+                        SNDRV_RAWMIDI_INFO_OUTPUT |
+                        SNDRV_RAWMIDI_INFO_INPUT |
+                        SNDRV_RAWMIDI_INFO_DUPLEX;
+        } else {
+                /* TCO MTC, read only */
+                sprintf(buf, "%s MTC %d", card->shortname, id+1);
+                err = snd_rawmidi_new(card, buf, id, 1, 1,
+                                &hdspm->midi[id].rmidi);
+                if (err < 0)
+                        return err;
 
-        hdspm->midi[id].rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
-                SNDRV_RAWMIDI_INFO_INPUT |
-                SNDRV_RAWMIDI_INFO_DUPLEX;
+                sprintf(hdspm->midi[id].rmidi->name,
+                                "%s MTC %d", card->id, id+1);
+                hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
+
+                snd_rawmidi_set_ops(hdspm->midi[id].rmidi,
+                                SNDRV_RAWMIDI_STREAM_INPUT,
+                                &snd_hdspm_midi_input);
+
+                hdspm->midi[id].rmidi->info_flags |= SNDRV_RAWMIDI_INFO_INPUT;
+        }
 
         return 0;
 }
@@ -1312,12 +1902,15 @@ static int __devinit snd_hdspm_create_midi (struct snd_card *card,
 static void hdspm_midi_tasklet(unsigned long arg)
 {
         struct hdspm *hdspm = (struct hdspm *)arg;
-        
-        if (hdspm->midi[0].pending)
-                snd_hdspm_midi_input_read (&hdspm->midi[0]);
-        if (hdspm->midi[1].pending)
-                snd_hdspm_midi_input_read (&hdspm->midi[1]);
-} 
+        int i = 0;
+
+        while (i < hdspm->midiPorts) {
+                if (hdspm->midi[i].pending)
+                        snd_hdspm_midi_input_read(&hdspm->midi[i]);
+
+                i++;
+        }
+}
 
 
 /*-----------------------------------------------------------------------------
@@ -1326,6 +1919,22 @@ static void hdspm_midi_tasklet(unsigned long arg)
 
 /* get the system sample rate which is set */
 
+
+/**
+ * Calculate the real sample rate from the
+ * current DDS value.
+ **/
+static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
+{
+        unsigned int period, rate;
+
+        period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+        rate = hdspm_calc_dds_value(hdspm, period);
+
+        return rate;
+}
+
+
 #define HDSPM_SYSTEM_SAMPLE_RATE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1340,112 +1949,274 @@ static int snd_hdspm_info_system_sample_rate(struct snd_kcontrol *kcontrol,
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
+        uinfo->value.integer.min = 27000;
+        uinfo->value.integer.max = 207000;
+        uinfo->value.integer.step = 1;
         return 0;
 }
 
+
 static int snd_hdspm_get_system_sample_rate(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_value *
                                             ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] = hdspm->system_sample_rate;
+        ucontrol->value.integer.value[0] = hdspm_get_system_sample_rate(hdspm);
+        return 0;
+}
+
+
+/**
+ * Returns the WordClock sample rate class for the given card.
+ **/
+static int hdspm_get_wc_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+                return (status >> 16) & 0xF;
+                break;
+        default:
+                break;
+        }
+
+
+        return 0;
+}
+
+
+/**
+ * Returns the TCO sample rate class for the given card.
+ **/
+static int hdspm_get_tco_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+                        return (status >> 20) & 0xF;
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+
+/**
+ * Returns the SYNC_IN sample rate class for the given card.
+ **/
+static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
+                        return (status >> 12) & 0xF;
+                        break;
+                default:
+                        break;
+                }
+        }
+
         return 0;
 }
 
+
+/**
+ * Returns the sample rate class for input source <idx> for
+ * 'new style' cards like the AIO and RayDAT.
+ **/
+static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx)
+{
+        int status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
+
+        return (status >> (idx*4)) & 0xF;
+}
+
+
+
 #define HDSPM_AUTOSYNC_SAMPLE_RATE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
-  .info = snd_hdspm_info_autosync_sample_rate, \
-  .get = snd_hdspm_get_autosync_sample_rate \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ, \
+        .info = snd_hdspm_info_autosync_sample_rate, \
+        .get = snd_hdspm_get_autosync_sample_rate \
 }
 
+
 static int snd_hdspm_info_autosync_sample_rate(struct snd_kcontrol *kcontrol,
                                                struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "32000", "44100", "48000",
-                "64000", "88200", "96000",
-                "128000", "176400", "192000",
-                "None"
-        };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
         uinfo->value.enumerated.items = 10;
+
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
         strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+                        texts_freq[uinfo->value.enumerated.item]);
         return 0;
 }
 
+
 static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol,
                                               struct snd_ctl_elem_value *
                                               ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        switch (hdspm_external_sample_rate(hdspm)) {
-        case 32000:
-                ucontrol->value.enumerated.item[0] = 0;
-                break;
-        case 44100:
-                ucontrol->value.enumerated.item[0] = 1;
-                break;
-        case 48000:
-                ucontrol->value.enumerated.item[0] = 2;
-                break;
-        case 64000:
-                ucontrol->value.enumerated.item[0] = 3;
-                break;
-        case 88200:
-                ucontrol->value.enumerated.item[0] = 4;
-                break;
-        case 96000:
-                ucontrol->value.enumerated.item[0] = 5;
-                break;
-        case 128000:
-                ucontrol->value.enumerated.item[0] = 6;
-                break;
-        case 176400:
-                ucontrol->value.enumerated.item[0] = 7;
-                break;
-        case 192000:
-                ucontrol->value.enumerated.item[0] = 8;
-                break;
+        switch (hdspm->io_type) {
+        case RayDAT:
+                switch (kcontrol->private_value) {
+                case 0:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 7:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 8:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                kcontrol->private_value-1);
+                }
+
+        case AIO:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 4: /* TCO */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 5: /* SYNC_IN */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default:
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                ucontrol->id.index-1);
+                }
+
+        case AES32:
 
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_wc_sample_rate(hdspm);
+                        break;
+                case 9: /* TCO */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_tco_sample_rate(hdspm);
+                        break;
+                case 10: /* SYNC_IN */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_sync_in_sample_rate(hdspm);
+                        break;
+                default: /* AES1 to AES8 */
+                        ucontrol->value.enumerated.item[0] =
+                                hdspm_get_s1_sample_rate(hdspm,
+                                                kcontrol->private_value-1);
+                        break;
+
+                }
         default:
-                ucontrol->value.enumerated.item[0] = 9;
+                break;
         }
+
         return 0;
 }
 
+
 #define HDSPM_SYSTEM_CLOCK_MODE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ, \
-  .info = snd_hdspm_info_system_clock_mode, \
-  .get = snd_hdspm_get_system_clock_mode, \
-}
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_system_clock_mode, \
+        .get = snd_hdspm_get_system_clock_mode, \
+        .put = snd_hdspm_put_system_clock_mode, \
+}
+
+
+/**
+ * Returns the system clock mode for the given card.
+ * @returns 0 - master, 1 - slave
+ **/
+static int hdspm_system_clock_mode(struct hdspm *hdspm)
+{
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (hdspm->settings_register & HDSPM_c0Master)
+                        return 0;
+                break;
+
+        default:
+                if (hdspm->control_register & HDSPM_ClockModeMaster)
+                        return 0;
+        }
 
+        return 1;
+}
 
 
-static int hdspm_system_clock_mode(struct hdspm * hdspm)
+/**
+ * Sets the system clock mode.
+ * @param mode 0 - master, 1 - slave
+ **/
+static void hdspm_set_system_clock_mode(struct hdspm *hdspm, int mode)
 {
-        /* Always reflect the hardware info, rme is never wrong !!!! */
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (0 == mode)
+                        hdspm->settings_register |= HDSPM_c0Master;
+                else
+                        hdspm->settings_register &= ~HDSPM_c0Master;
 
-        if (hdspm->control_register & HDSPM_ClockModeMaster)
-                return 0;
-        return 1;
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
+                break;
+
+        default:
+                if (0 == mode)
+                        hdspm->control_register |= HDSPM_ClockModeMaster;
+                else
+                        hdspm->control_register &= ~HDSPM_ClockModeMaster;
+
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                                hdspm->control_register);
+        }
 }
 
+
 static int snd_hdspm_info_system_clock_mode(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "Master", "Slave" };
+        static char *texts[] = { "Master", "AutoSync" };
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
@@ -1463,96 +2234,83 @@ static int snd_hdspm_get_system_clock_mode(struct snd_kcontrol *kcontrol,
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] =
-            hdspm_system_clock_mode(hdspm);
+        ucontrol->value.enumerated.item[0] = hdspm_system_clock_mode(hdspm);
         return 0;
 }
 
-#define HDSPM_CLOCK_SOURCE(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .info = snd_hdspm_info_clock_source, \
-  .get = snd_hdspm_get_clock_source, \
-  .put = snd_hdspm_put_clock_source \
+static int snd_hdspm_put_system_clock_mode(struct snd_kcontrol *kcontrol,
+                                           struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int val;
+
+        if (!snd_hdspm_use_is_exclusive(hdspm))
+                return -EBUSY;
+
+        val = ucontrol->value.enumerated.item[0];
+        if (val < 0)
+                val = 0;
+        else if (val > 1)
+                val = 1;
+
+        hdspm_set_system_clock_mode(hdspm, val);
+
+        return 0;
 }
 
+
+#define HDSPM_INTERNAL_CLOCK(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .info = snd_hdspm_info_clock_source, \
+        .get = snd_hdspm_get_clock_source, \
+        .put = snd_hdspm_put_clock_source \
+}
+
+
 static int hdspm_clock_source(struct hdspm * hdspm)
 {
-        if (hdspm->control_register & HDSPM_ClockModeMaster) {
-                switch (hdspm->system_sample_rate) {
-                case 32000:
-                        return 1;
-                case 44100:
-                        return 2;
-                case 48000:
-                        return 3;
-                case 64000:
-                        return 4;
-                case 88200:
-                        return 5;
-                case 96000:
-                        return 6;
-                case 128000:
-                        return 7;
-                case 176400:
-                        return 8;
-                case 192000:
-                        return 9;
-                default:
-                        return 3;
-                }
-        } else {
-                return 0;
+        switch (hdspm->system_sample_rate) {
+        case 32000: return 0;
+        case 44100: return 1;
+        case 48000: return 2;
+        case 64000: return 3;
+        case 88200: return 4;
+        case 96000: return 5;
+        case 128000: return 6;
+        case 176400: return 7;
+        case 192000: return 8;
         }
+
+        return -1;
 }
 
 static int hdspm_set_clock_source(struct hdspm * hdspm, int mode)
 {
         int rate;
         switch (mode) {
-
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                if (hdspm_external_sample_rate(hdspm) != 0) {
-                        hdspm->control_register &= ~HDSPM_ClockModeMaster;
-                        hdspm_write(hdspm, HDSPM_controlRegister,
-                                    hdspm->control_register);
-                        return 0;
-                }
-                return -1;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                rate = 32000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                rate = 44100;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                rate = 48000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                rate = 64000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                rate = 88200;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                rate = 96000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ:
-                rate = 128000;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ:
-                rate = 176400;
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ:
-                rate = 192000;
-                break;
-
+        case 0:
+                rate = 32000; break;
+        case 1:
+                rate = 44100; break;
+        case 2:
+                rate = 48000; break;
+        case 3:
+                rate = 64000; break;
+        case 4:
+                rate = 88200; break;
+        case 5:
+                rate = 96000; break;
+        case 6:
+                rate = 128000; break;
+        case 7:
+                rate = 176400; break;
+        case 8:
+                rate = 192000; break;
         default:
-                rate = 44100;
+                rate = 48000;
         }
-        hdspm->control_register |= HDSPM_ClockModeMaster;
-        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
         hdspm_set_rate(hdspm, rate, 1);
         return 0;
 }
@@ -1560,25 +2318,16 @@ static int hdspm_set_clock_source(struct hdspm * hdspm, int mode)
 static int snd_hdspm_info_clock_source(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "AutoSync",
-                "Internal 32.0 kHz", "Internal 44.1 kHz",
-                    "Internal 48.0 kHz",
-                "Internal 64.0 kHz", "Internal 88.2 kHz",
-                    "Internal 96.0 kHz",
-                "Internal 128.0 kHz", "Internal 176.4 kHz",
-                    "Internal 192.0 kHz"
-        };
-
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 10;
+        uinfo->value.enumerated.items = 9;
 
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item =
                     uinfo->value.enumerated.items - 1;
 
         strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+               texts_freq[uinfo->value.enumerated.item+1]);
 
         return 0;
 }
@@ -1615,134 +2364,301 @@ static int snd_hdspm_put_clock_source(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-#define HDSPM_PREF_SYNC_REF(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .info = snd_hdspm_info_pref_sync_ref, \
-  .get = snd_hdspm_get_pref_sync_ref, \
-  .put = snd_hdspm_put_pref_sync_ref \
-}
 
+#define HDSPM_PREF_SYNC_REF(xname, xindex) \
+{.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_pref_sync_ref, \
+        .get = snd_hdspm_get_pref_sync_ref, \
+        .put = snd_hdspm_put_pref_sync_ref \
+}
+
+
+/**
+ * Returns the current preferred sync reference setting.
+ * The semantics of the return value are depending on the
+ * card, please see the comments for clarification.
+ **/
 static int hdspm_pref_sync_ref(struct hdspm * hdspm)
 {
-        /* Notice that this looks at the requested sync source,
-           not the one actually in use.
-         */
-        if (hdspm->is_aes32) {
+        switch (hdspm->io_type) {
+        case AES32:
                 switch (hdspm->control_register & HDSPM_SyncRefMask) {
-                /* number gives AES index, except for 0 which
-                   corresponds to WordClock */
-                case 0: return 0;
-                case HDSPM_SyncRef0: return 1;
-                case HDSPM_SyncRef1: return 2;
-                case HDSPM_SyncRef1+HDSPM_SyncRef0: return 3;
-                case HDSPM_SyncRef2: return 4;
-                case HDSPM_SyncRef2+HDSPM_SyncRef0: return 5;
-                case HDSPM_SyncRef2+HDSPM_SyncRef1: return 6;
-                case HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0: return 7;
-                case HDSPM_SyncRef3: return 8;
+                case 0: return 0;  /* WC */
+                case HDSPM_SyncRef0: return 1; /* AES 1 */
+                case HDSPM_SyncRef1: return 2; /* AES 2 */
+                case HDSPM_SyncRef1+HDSPM_SyncRef0: return 3; /* AES 3 */
+                case HDSPM_SyncRef2: return 4; /* AES 4 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef0: return 5; /* AES 5 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef1: return 6; /* AES 6 */
+                case HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                                    return 7; /* AES 7 */
+                case HDSPM_SyncRef3: return 8; /* AES 8 */
+                case HDSPM_SyncRef3+HDSPM_SyncRef0: return 9; /* TCO */
                 }
-        } else {
-                switch (hdspm->control_register & HDSPM_SyncRefMask) {
-                case HDSPM_SyncRef_Word:
-                        return HDSPM_SYNC_FROM_WORD;
-                case HDSPM_SyncRef_MADI:
-                        return HDSPM_SYNC_FROM_MADI;
+                break;
+
+        case MADI:
+        case MADIface:
+                if (hdspm->tco) {
+                        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+                        case 0: return 0;  /* WC */
+                        case HDSPM_SyncRef0: return 1;  /* MADI */
+                        case HDSPM_SyncRef1: return 2;  /* TCO */
+                        case HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                             return 3;  /* SYNC_IN */
+                        }
+                } else {
+                        switch (hdspm->control_register & HDSPM_SyncRefMask) {
+                        case 0: return 0;  /* WC */
+                        case HDSPM_SyncRef0: return 1;  /* MADI */
+                        case HDSPM_SyncRef1+HDSPM_SyncRef0:
+                                             return 2;  /* SYNC_IN */
+                        }
+                }
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT 1 */
+                        case 4: return 2;  /* ADAT 2 */
+                        case 5: return 3;  /* ADAT 3 */
+                        case 6: return 4;  /* ADAT 4 */
+                        case 1: return 5;  /* AES */
+                        case 2: return 6;  /* SPDIF */
+                        case 9: return 7;  /* TCO */
+                        case 10: return 8; /* SYNC_IN */
+                        }
+                } else {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT 1 */
+                        case 4: return 2;  /* ADAT 2 */
+                        case 5: return 3;  /* ADAT 3 */
+                        case 6: return 4;  /* ADAT 4 */
+                        case 1: return 5;  /* AES */
+                        case 2: return 6;  /* SPDIF */
+                        case 10: return 7; /* SYNC_IN */
+                        }
                 }
+
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT */
+                        case 1: return 2;  /* AES */
+                        case 2: return 3;  /* SPDIF */
+                        case 9: return 4;  /* TCO */
+                        case 10: return 5; /* SYNC_IN */
+                        }
+                } else {
+                        switch ((hdspm->settings_register &
+                                HDSPM_c0_SyncRefMask) / HDSPM_c0_SyncRef0) {
+                        case 0: return 0;  /* WC */
+                        case 3: return 1;  /* ADAT */
+                        case 1: return 2;  /* AES */
+                        case 2: return 3;  /* SPDIF */
+                        case 10: return 4; /* SYNC_IN */
+                        }
+                }
+
+                break;
         }
 
-        return HDSPM_SYNC_FROM_WORD;
+        return -1;
 }
 
+
+/**
+ * Set the preferred sync reference to <pref>. The semantics
+ * of <pref> are depending on the card type, see the comments
+ * for clarification.
+ **/
 static int hdspm_set_pref_sync_ref(struct hdspm * hdspm, int pref)
 {
-        hdspm->control_register &= ~HDSPM_SyncRefMask;
+        int p = 0;
 
-        if (hdspm->is_aes32) {
-                switch (pref) {
-                case 0:
-                       hdspm->control_register |= 0;
-                       break;
-                case 1:
-                       hdspm->control_register |= HDSPM_SyncRef0;
-                       break;
-                case 2:
-                       hdspm->control_register |= HDSPM_SyncRef1;
-                       break;
-                case 3:
-                       hdspm->control_register |= HDSPM_SyncRef1+HDSPM_SyncRef0;
-                       break;
-                case 4:
-                       hdspm->control_register |= HDSPM_SyncRef2;
-                       break;
-                case 5:
-                       hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef0;
-                       break;
-                case 6:
-                       hdspm->control_register |= HDSPM_SyncRef2+HDSPM_SyncRef1;
-                       break;
-                case 7:
-                       hdspm->control_register |=
-                               HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
-                       break;
-                case 8:
-                       hdspm->control_register |= HDSPM_SyncRef3;
-                       break;
-                default:
-                       return -1;
-                }
-        } else {
+        switch (hdspm->io_type) {
+        case AES32:
+                hdspm->control_register &= ~HDSPM_SyncRefMask;
                 switch (pref) {
-                case HDSPM_SYNC_FROM_MADI:
-                        hdspm->control_register |= HDSPM_SyncRef_MADI;
+                case 0: /* WC  */
+                        break;
+                case 1: /* AES 1 */
+                        hdspm->control_register |= HDSPM_SyncRef0;
+                        break;
+                case 2: /* AES 2 */
+                        hdspm->control_register |= HDSPM_SyncRef1;
+                        break;
+                case 3: /* AES 3 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef1+HDSPM_SyncRef0;
+                        break;
+                case 4: /* AES 4 */
+                        hdspm->control_register |= HDSPM_SyncRef2;
+                        break;
+                case 5: /* AES 5 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef0;
                         break;
-                case HDSPM_SYNC_FROM_WORD:
-                        hdspm->control_register |= HDSPM_SyncRef_Word;
+                case 6: /* AES 6 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef1;
+                        break;
+                case 7: /* AES 7 */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef2+HDSPM_SyncRef1+HDSPM_SyncRef0;
+                        break;
+                case 8: /* AES 8 */
+                        hdspm->control_register |= HDSPM_SyncRef3;
+                        break;
+                case 9: /* TCO */
+                        hdspm->control_register |=
+                                HDSPM_SyncRef3+HDSPM_SyncRef0;
                         break;
                 default:
                         return -1;
                 }
+
+                break;
+
+        case MADI:
+        case MADIface:
+                hdspm->control_register &= ~HDSPM_SyncRefMask;
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: /* WC */
+                                break;
+                        case 1: /* MADI */
+                                hdspm->control_register |= HDSPM_SyncRef0;
+                                break;
+                        case 2: /* TCO */
+                                hdspm->control_register |= HDSPM_SyncRef1;
+                                break;
+                        case 3: /* SYNC_IN */
+                                hdspm->control_register |=
+                                        HDSPM_SyncRef0+HDSPM_SyncRef1;
+                                break;
+                        default:
+                                return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: /* WC */
+                                break;
+                        case 1: /* MADI */
+                                hdspm->control_register |= HDSPM_SyncRef0;
+                                break;
+                        case 2: /* SYNC_IN */
+                                hdspm->control_register |=
+                                        HDSPM_SyncRef0+HDSPM_SyncRef1;
+                                break;
+                        default:
+                                return -1;
+                        }
+                }
+
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT 1 */
+                        case 2: p = 4; break;  /* ADAT 2 */
+                        case 3: p = 5; break;  /* ADAT 3 */
+                        case 4: p = 6; break;  /* ADAT 4 */
+                        case 5: p = 1; break;  /* AES */
+                        case 6: p = 2; break;  /* SPDIF */
+                        case 7: p = 9; break;  /* TCO */
+                        case 8: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT 1 */
+                        case 2: p = 4; break;  /* ADAT 2 */
+                        case 3: p = 5; break;  /* ADAT 3 */
+                        case 4: p = 6; break;  /* ADAT 4 */
+                        case 5: p = 1; break;  /* AES */
+                        case 6: p = 2; break;  /* SPDIF */
+                        case 7: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                }
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT */
+                        case 2: p = 1; break;  /* AES */
+                        case 3: p = 2; break;  /* SPDIF */
+                        case 4: p = 9; break;  /* TCO */
+                        case 5: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                } else {
+                        switch (pref) {
+                        case 0: p = 0; break;  /* WC */
+                        case 1: p = 3; break;  /* ADAT */
+                        case 2: p = 1; break;  /* AES */
+                        case 3: p = 2; break;  /* SPDIF */
+                        case 4: p = 10; break; /* SYNC_IN */
+                        default: return -1;
+                        }
+                }
+                break;
         }
-        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                hdspm->settings_register &= ~HDSPM_c0_SyncRefMask;
+                hdspm->settings_register |= HDSPM_c0_SyncRef0 * p;
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
+                break;
+
+        case MADI:
+        case MADIface:
+        case AES32:
+                hdspm_write(hdspm, HDSPM_controlRegister,
+                                hdspm->control_register);
+        }
+
         return 0;
 }
 
+
 static int snd_hdspm_info_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_info *uinfo)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        if (hdspm->is_aes32) {
-                static char *texts[] = { "Word", "AES1", "AES2", "AES3",
-                        "AES4", "AES5", "AES6", "AES7", "AES8" };
-
-                uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-                uinfo->count = 1;
-
-                uinfo->value.enumerated.items = 9;
-
-                if (uinfo->value.enumerated.item >=
-                    uinfo->value.enumerated.items)
-                        uinfo->value.enumerated.item =
-                                uinfo->value.enumerated.items - 1;
-                strcpy(uinfo->value.enumerated.name,
-                                texts[uinfo->value.enumerated.item]);
-        } else {
-                static char *texts[] = { "Word", "MADI" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = hdspm->texts_autosync_items;
 
-                uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-                uinfo->count = 1;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
 
-                uinfo->value.enumerated.items = 2;
+        strcpy(uinfo->value.enumerated.name,
+                        hdspm->texts_autosync[uinfo->value.enumerated.item]);
 
-                if (uinfo->value.enumerated.item >=
-                    uinfo->value.enumerated.items)
-                        uinfo->value.enumerated.item =
-                                uinfo->value.enumerated.items - 1;
-                strcpy(uinfo->value.enumerated.name,
-                                texts[uinfo->value.enumerated.item]);
-        }
         return 0;
 }
 
@@ -1750,32 +2666,41 @@ static int snd_hdspm_get_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int psf = hdspm_pref_sync_ref(hdspm);
 
-        ucontrol->value.enumerated.item[0] = hdspm_pref_sync_ref(hdspm);
-        return 0;
+        if (psf >= 0) {
+                ucontrol->value.enumerated.item[0] = psf;
+                return 0;
+        }
+
+        return -1;
 }
 
 static int snd_hdspm_put_pref_sync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
-        int change, max;
-        unsigned int val;
-
-        max = hdspm->is_aes32 ? 9 : 2;
+        int val, change = 0;
 
         if (!snd_hdspm_use_is_exclusive(hdspm))
                 return -EBUSY;
 
-        val = ucontrol->value.enumerated.item[0] % max;
+        val = ucontrol->value.enumerated.item[0];
+
+        if (val < 0)
+                val = 0;
+        else if (val >= hdspm->texts_autosync_items)
+                val = hdspm->texts_autosync_items-1;
 
         spin_lock_irq(&hdspm->lock);
-        change = (int) val != hdspm_pref_sync_ref(hdspm);
-        hdspm_set_pref_sync_ref(hdspm, val);
+        if (val != hdspm_pref_sync_ref(hdspm))
+                change = (0 == hdspm_set_pref_sync_ref(hdspm, val)) ? 1 : 0;
+
         spin_unlock_irq(&hdspm->lock);
         return change;
 }
 
+
 #define HDSPM_AUTOSYNC_REF(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1785,18 +2710,18 @@ static int snd_hdspm_put_pref_sync_ref(struct snd_kcontrol *kcontrol,
   .get = snd_hdspm_get_autosync_ref, \
 }
 
-static int hdspm_autosync_ref(struct hdspm * hdspm)
+static int hdspm_autosync_ref(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 unsigned int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                unsigned int syncref = (status >> HDSPM_AES32_syncref_bit) &
-                        0xF;
+                unsigned int syncref =
+                        (status >> HDSPM_AES32_syncref_bit) & 0xF;
                 if (syncref == 0)
                         return HDSPM_AES32_AUTOSYNC_FROM_WORD;
                 if (syncref <= 8)
                         return syncref;
                 return HDSPM_AES32_AUTOSYNC_FROM_NONE;
-        } else {
+        } else if (MADI == hdspm->io_type) {
                 /* This looks at the autosync selected sync reference */
                 unsigned int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
 
@@ -1805,22 +2730,27 @@ static int hdspm_autosync_ref(struct hdspm * hdspm)
                         return HDSPM_AUTOSYNC_FROM_WORD;
                 case HDSPM_SelSyncRef_MADI:
                         return HDSPM_AUTOSYNC_FROM_MADI;
+                case HDSPM_SelSyncRef_TCO:
+                        return HDSPM_AUTOSYNC_FROM_TCO;
+                case HDSPM_SelSyncRef_SyncIn:
+                        return HDSPM_AUTOSYNC_FROM_SYNC_IN;
                 case HDSPM_SelSyncRef_NVALID:
                         return HDSPM_AUTOSYNC_FROM_NONE;
                 default:
                         return 0;
                 }
 
-                return 0;
         }
+        return 0;
 }
 
+
 static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        if (hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 static char *texts[] = { "WordClock", "AES1", "AES2", "AES3",
                         "AES4", "AES5", "AES6", "AES7", "AES8", "None"};
 
@@ -1833,14 +2763,15 @@ static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
                                 texts[uinfo->value.enumerated.item]);
-        } else {
-                static char *texts[] = { "WordClock", "MADI", "None" };
+        } else if (MADI == hdspm->io_type) {
+                static char *texts[] = {"Word Clock", "MADI", "TCO",
+                        "Sync In", "None" };
 
                 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
                 uinfo->count = 1;
-                uinfo->value.enumerated.items = 3;
+                uinfo->value.enumerated.items = 5;
                 if (uinfo->value.enumerated.item >=
-                    uinfo->value.enumerated.items)
+                                uinfo->value.enumerated.items)
                         uinfo->value.enumerated.item =
                                 uinfo->value.enumerated.items - 1;
                 strcpy(uinfo->value.enumerated.name,
@@ -1858,6 +2789,7 @@ static int snd_hdspm_get_autosync_ref(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+
 #define HDSPM_LINE_OUT(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1914,6 +2846,7 @@ static int snd_hdspm_put_line_out(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_TX_64(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -1969,6 +2902,7 @@ static int snd_hdspm_put_tx_64(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_C_TMS(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2024,6 +2958,7 @@ static int snd_hdspm_put_c_tms(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_SAFE_MODE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2079,6 +3014,7 @@ static int snd_hdspm_put_safe_mode(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_EMPHASIS(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2134,6 +3070,7 @@ static int snd_hdspm_put_emphasis(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_DOLBY(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2189,6 +3126,7 @@ static int snd_hdspm_put_dolby(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_PROFESSIONAL(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2315,6 +3253,7 @@ static int snd_hdspm_put_input_select(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_DS_WIRE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2386,6 +3325,7 @@ static int snd_hdspm_put_ds_wire(struct snd_kcontrol *kcontrol,
         return change;
 }
 
+
 #define HDSPM_QS_WIRE(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
   .name = xname, \
@@ -2472,15 +3412,6 @@ static int snd_hdspm_put_qs_wire(struct snd_kcontrol *kcontrol,
         return change;
 }
 
-/*           Simple Mixer
-  deprecated since to much faders ???
-  MIXER interface says output (source, destination, value)
-   where source > MAX_channels are playback channels 
-   on MADICARD 
-  - playback mixer matrix: [channelout+64] [output] [value]
-  - input(thru) mixer matrix: [channelin] [output] [value]
-  (better do 2 kontrols for separation ?)
-*/
 
 #define HDSPM_MIXER(xname, xindex) \
 { .iface = SNDRV_CTL_ELEM_IFACE_HWDEP, \
@@ -2586,7 +3517,7 @@ static int snd_hdspm_put_mixer(struct snd_kcontrol *kcontrol,
 
 /* The simple mixer control(s) provide gain control for the
    basic 1:1 mappings of playback streams to output
-   streams. 
+   streams.
 */
 
 #define HDSPM_PLAYBACK_MIXER \
@@ -2604,7 +3535,7 @@ static int snd_hdspm_info_playback_mixer(struct snd_kcontrol *kcontrol,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 65536;
+        uinfo->value.integer.max = 64;
         uinfo->value.integer.step = 1;
         return 0;
 }
@@ -2614,28 +3545,17 @@ static int snd_hdspm_get_playback_mixer(struct snd_kcontrol *kcontrol,
 {
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
         int channel;
-        int mapped_channel;
 
         channel = ucontrol->id.index - 1;
 
         if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
                 return -EINVAL;
 
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
-
         spin_lock_irq(&hdspm->lock);
         ucontrol->value.integer.value[0] =
-            hdspm_read_pb_gain(hdspm, mapped_channel, mapped_channel);
+          (hdspm_read_pb_gain(hdspm, channel, channel)*64)/UNITY_GAIN;
         spin_unlock_irq(&hdspm->lock);
 
-        /*
-        snd_printdd("get pb mixer index %d, channel %d, mapped_channel %d, "
-                    "value %d\n",
-                    ucontrol->id.index, channel, mapped_channel,
-                    ucontrol->value.integer.value[0]); 
-        */
         return 0;
 }
 
@@ -2645,7 +3565,6 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
         int change;
         int channel;
-        int mapped_channel;
         int gain;
 
         if (!snd_hdspm_use_is_exclusive(hdspm))
@@ -2656,59 +3575,60 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
                 return -EINVAL;
 
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
-
-        gain = ucontrol->value.integer.value[0];
+        gain = ucontrol->value.integer.value[0]*UNITY_GAIN/64;
 
         spin_lock_irq(&hdspm->lock);
         change =
-            gain != hdspm_read_pb_gain(hdspm, mapped_channel,
-                                       mapped_channel);
+            gain != hdspm_read_pb_gain(hdspm, channel,
+                                       channel);
         if (change)
-                hdspm_write_pb_gain(hdspm, mapped_channel, mapped_channel,
+                hdspm_write_pb_gain(hdspm, channel, channel,
                                     gain);
         spin_unlock_irq(&hdspm->lock);
         return change;
 }
 
-#define HDSPM_WC_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_wc_sync_check \
+#define HDSPM_SYNC_CHECK(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_sync_check, \
+        .get = snd_hdspm_get_sync_check \
 }
 
+
 static int snd_hdspm_info_sync_check(struct snd_kcontrol *kcontrol,
                                      struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[] = { "No Lock", "Lock", "Sync" };
+        static char *texts[] = { "No Lock", "Lock", "Sync", "N/A" };
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
+        uinfo->value.enumerated.items = 4;
         if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
                 uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
+                        uinfo->value.enumerated.items - 1;
         strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+                        texts[uinfo->value.enumerated.item]);
         return 0;
 }
 
-static int hdspm_wc_sync_check(struct hdspm * hdspm)
+static int hdspm_wc_sync_check(struct hdspm *hdspm)
 {
-        if (hdspm->is_aes32) {
-                int status = hdspm_read(hdspm, HDSPM_statusRegister);
-                if (status & HDSPM_AES32_wcLock) {
-                        /* I don't know how to differenciate sync from lock.
-                           Doing as if sync for now */
+        int status, status2;
+
+        switch (hdspm->io_type) {
+        case AES32:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
+                if (status & HDSPM_wcSync)
                         return 2;
-                }
+                else if (status & HDSPM_wcLock)
+                        return 1;
                 return 0;
-        } else {
-                int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+                break;
+
+        case MADI:
+                status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
                 if (status2 & HDSPM_wcLock) {
                         if (status2 & HDSPM_wcSync)
                                 return 2;
@@ -2716,29 +3636,30 @@ static int hdspm_wc_sync_check(struct hdspm * hdspm)
                                 return 1;
                 }
                 return 0;
-        }
-}
+                break;
 
-static int snd_hdspm_get_wc_sync_check(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_statusRegister);
 
-        ucontrol->value.enumerated.item[0] = hdspm_wc_sync_check(hdspm);
-        return 0;
-}
+                if (status & 0x2000000)
+                        return 2;
+                else if (status & 0x1000000)
+                        return 1;
+                return 0;
 
+                break;
 
-#define HDSPM_MADI_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_madisync_sync_check \
+        case MADIface:
+                break;
+        }
+
+
+        return 3;
 }
 
-static int hdspm_madisync_sync_check(struct hdspm * hdspm)
+
+static int hdspm_madi_sync_check(struct hdspm *hdspm)
 {
         int status = hdspm_read(hdspm, HDSPM_statusRegister);
         if (status & HDSPM_madiLock) {
@@ -2750,89 +3671,726 @@ static int hdspm_madisync_sync_check(struct hdspm * hdspm)
         return 0;
 }
 
-static int snd_hdspm_get_madisync_sync_check(struct snd_kcontrol *kcontrol,
-                                             struct snd_ctl_elem_value *
-                                             ucontrol)
+
+static int hdspm_s1_sync_check(struct hdspm *hdspm, int idx)
 {
-        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int status, lock, sync;
+
+        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+
+        lock = (status & (0x1<<idx)) ? 1 : 0;
+        sync = (status & (0x100<<idx)) ? 1 : 0;
 
-        ucontrol->value.enumerated.item[0] =
-            hdspm_madisync_sync_check(hdspm);
+        if (lock && sync)
+                return 2;
+        else if (lock)
+                return 1;
         return 0;
 }
 
 
-#define HDSPM_AES_SYNC_CHECK(xname, xindex) \
-{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
-  .name = xname, \
-  .index = xindex, \
-  .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-  .info = snd_hdspm_info_sync_check, \
-  .get = snd_hdspm_get_aes_sync_check \
+static int hdspm_sync_in_sync_check(struct hdspm *hdspm)
+{
+        int status, lock = 0, sync = 0;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+        case AIO:
+                status = hdspm_read(hdspm, HDSPM_RD_STATUS_3);
+                lock = (status & 0x400) ? 1 : 0;
+                sync = (status & 0x800) ? 1 : 0;
+                break;
+
+        case MADI:
+        case AES32:
+                status = hdspm_read(hdspm, HDSPM_statusRegister2);
+                lock = (status & HDSPM_syncInLock) ? 1 : 0;
+                sync = (status & HDSPM_syncInSync) ? 1 : 0;
+                break;
+
+        case MADIface:
+                break;
+        }
+
+        if (lock && sync)
+                return 2;
+        else if (lock)
+                return 1;
+
+        return 0;
 }
 
-static int hdspm_aes_sync_check(struct hdspm * hdspm, int idx)
+static int hdspm_aes_sync_check(struct hdspm *hdspm, int idx)
 {
-        int status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
-        if (status2 & (HDSPM_LockAES >> idx)) {
-                /* I don't know how to differenciate sync from lock.
-                   Doing as if sync for now */
+        int status2, lock, sync;
+        status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+        lock = (status2 & (0x0080 >> idx)) ? 1 : 0;
+        sync = (status2 & (0x8000 >> idx)) ? 1 : 0;
+
+        if (sync)
                 return 2;
+        else if (lock)
+                return 1;
+        return 0;
+}
+
+
+static int hdspm_tco_sync_check(struct hdspm *hdspm)
+{
+        int status;
+
+        if (hdspm->tco) {
+                switch (hdspm->io_type) {
+                case MADI:
+                case AES32:
+                        status = hdspm_read(hdspm, HDSPM_statusRegister);
+                        if (status & HDSPM_tcoLock) {
+                                if (status & HDSPM_tcoSync)
+                                        return 2;
+                                else
+                                        return 1;
+                        }
+                        return 0;
+
+                        break;
+
+                case RayDAT:
+                case AIO:
+                        status = hdspm_read(hdspm, HDSPM_RD_STATUS_1);
+
+                        if (status & 0x8000000)
+                                return 2; /* Sync */
+                        if (status & 0x4000000)
+                                return 1; /* Lock */
+                        return 0; /* No signal */
+                        break;
+
+                default:
+                        break;
+                }
+        }
+
+        return 3; /* N/A */
+}
+
+
+static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        int val = -1;
+
+        switch (hdspm->io_type) {
+        case RayDAT:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 7: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 8: /* SYNC IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default:
+                        val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);
+                }
+
+        case AIO:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 4: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 5: /* SYNC IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default:
+                        val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);
+                }
+
+        case MADI:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 1: /* MADI */
+                        val = hdspm_madi_sync_check(hdspm); break;
+                case 2: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 3: /* SYNC_IN */
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                }
+
+        case MADIface:
+                val = hdspm_madi_sync_check(hdspm); /* MADI */
+                break;
+
+        case AES32:
+                switch (kcontrol->private_value) {
+                case 0: /* WC */
+                        val = hdspm_wc_sync_check(hdspm); break;
+                case 9: /* TCO */
+                        val = hdspm_tco_sync_check(hdspm); break;
+                case 10 /* SYNC IN */:
+                        val = hdspm_sync_in_sync_check(hdspm); break;
+                default: /* AES1 to AES8 */
+                         val = hdspm_aes_sync_check(hdspm,
+                                         kcontrol->private_value-1);
+                }
+
         }
+
+        if (-1 == val)
+                val = 3;
+
+        ucontrol->value.enumerated.item[0] = val;
         return 0;
 }
 
-static int snd_hdspm_get_aes_sync_check(struct snd_kcontrol *kcontrol,
+
+
+/**
+ * TCO controls
+ **/
+static void hdspm_tco_write(struct hdspm *hdspm)
+{
+        unsigned int tc[4] = { 0, 0, 0, 0};
+
+        switch (hdspm->tco->input) {
+        case 0:
+                tc[2] |= HDSPM_TCO2_set_input_MSB;
+                break;
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_input_LSB;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->framerate) {
+        case 1:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB;
+                break;
+        case 2:
+                tc[1] |= HDSPM_TCO1_LTC_Format_MSB;
+                break;
+        case 3:
+                tc[1] |= HDSPM_TCO1_LTC_Format_MSB +
+                        HDSPM_TCO1_set_drop_frame_flag;
+                break;
+        case 4:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB +
+                        HDSPM_TCO1_LTC_Format_MSB;
+                break;
+        case 5:
+                tc[1] |= HDSPM_TCO1_LTC_Format_LSB +
+                        HDSPM_TCO1_LTC_Format_MSB +
+                        HDSPM_TCO1_set_drop_frame_flag;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->wordclock) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_WCK_IO_ratio_LSB;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_WCK_IO_ratio_MSB;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->samplerate) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_freq;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_set_freq_from_app;
+                break;
+        default:
+                break;
+        }
+
+        switch (hdspm->tco->pull) {
+        case 1:
+                tc[2] |= HDSPM_TCO2_set_pull_up;
+                break;
+        case 2:
+                tc[2] |= HDSPM_TCO2_set_pull_down;
+                break;
+        case 3:
+                tc[2] |= HDSPM_TCO2_set_pull_up + HDSPM_TCO2_set_01_4;
+                break;
+        case 4:
+                tc[2] |= HDSPM_TCO2_set_pull_down + HDSPM_TCO2_set_01_4;
+                break;
+        default:
+                break;
+        }
+
+        if (1 == hdspm->tco->term) {
+                tc[2] |= HDSPM_TCO2_set_term_75R;
+        }
+
+        hdspm_write(hdspm, HDSPM_WR_TCO, tc[0]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+4, tc[1]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+8, tc[2]);
+        hdspm_write(hdspm, HDSPM_WR_TCO+12, tc[3]);
+}
+
+
+#define HDSPM_TCO_SAMPLE_RATE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_sample_rate, \
+        .get = snd_hdspm_get_tco_sample_rate, \
+        .put = snd_hdspm_put_tco_sample_rate \
+}
+
+static int snd_hdspm_info_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "44.1 kHz", "48 kHz" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->samplerate;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_sample_rate(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->samplerate != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->samplerate = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_PULL(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_pull, \
+        .get = snd_hdspm_get_tco_pull, \
+        .put = snd_hdspm_put_tco_pull \
+}
+
+static int snd_hdspm_info_tco_pull(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "0", "+ 0.1 %", "- 0.1 %", "+ 4 %", "- 4 %" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 5;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_pull(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->pull;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_pull(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->pull != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->pull = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+#define HDSPM_TCO_WCK_CONVERSION(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_wck_conversion, \
+        .get = snd_hdspm_get_tco_wck_conversion, \
+        .put = snd_hdspm_put_tco_wck_conversion \
+}
+
+static int snd_hdspm_info_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "1:1", "44.1 -> 48", "48 -> 44.1" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->wordclock;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_wck_conversion(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->wordclock != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->wordclock = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_FRAME_RATE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_frame_rate, \
+        .get = snd_hdspm_get_tco_frame_rate, \
+        .put = snd_hdspm_put_tco_frame_rate \
+}
+
+static int snd_hdspm_info_tco_frame_rate(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "24 fps", "25 fps", "29.97fps",
+                "29.97 dfps", "30 fps", "30 dfps" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 6;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_frame_rate(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        int offset;
         struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
 
-        offset = ucontrol->id.index - 1;
-        if (offset < 0 || offset >= 8)
-                return -EINVAL;
+        ucontrol->value.enumerated.item[0] = hdspm->tco->framerate;
 
-        ucontrol->value.enumerated.item[0] =
-                hdspm_aes_sync_check(hdspm, offset);
         return 0;
 }
 
+static int snd_hdspm_put_tco_frame_rate(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->framerate != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->framerate = ucontrol->value.enumerated.item[0];
 
-static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
 
-        HDSPM_MIXER("Mixer", 0),
-/* 'Sample Clock Source' complies with the alsa control naming scheme */
-        HDSPM_CLOCK_SOURCE("Sample Clock Source", 0),
 
+#define HDSPM_TCO_SYNC_SOURCE(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_sync_source, \
+        .get = snd_hdspm_get_tco_sync_source, \
+        .put = snd_hdspm_put_tco_sync_source \
+}
+
+static int snd_hdspm_info_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "LTC", "Video", "WCK" };
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 3;
+
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item =
+                        uinfo->value.enumerated.items - 1;
+
+        strcpy(uinfo->value.enumerated.name,
+                        texts[uinfo->value.enumerated.item]);
+
+        return 0;
+}
+
+static int snd_hdspm_get_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->input;
+
+        return 0;
+}
+
+static int snd_hdspm_put_tco_sync_source(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->input != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->input = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+#define HDSPM_TCO_WORD_TERM(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .index = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_word_term, \
+        .get = snd_hdspm_get_tco_word_term, \
+        .put = snd_hdspm_put_tco_word_term \
+}
+
+static int snd_hdspm_info_tco_word_term(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+
+        return 0;
+}
+
+
+static int snd_hdspm_get_tco_word_term(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm->tco->term;
+
+        return 0;
+}
+
+
+static int snd_hdspm_put_tco_word_term(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        if (hdspm->tco->term != ucontrol->value.enumerated.item[0]) {
+                hdspm->tco->term = ucontrol->value.enumerated.item[0];
+
+                hdspm_tco_write(hdspm);
+
+                return 1;
+        }
+
+        return 0;
+}
+
+
+
+
+static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
         HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
         HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
         HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
         HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
-/* 'External Rate' complies with the alsa control naming scheme */
-        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
-        HDSPM_WC_SYNC_CHECK("Word Clock Lock Status", 0),
-        HDSPM_MADI_SYNC_CHECK("MADI Sync Lock Status", 0),
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("MADI SyncCheck", 1),
+        HDSPM_SYNC_CHECK("TCO SyncCHeck", 2),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 3),
         HDSPM_LINE_OUT("Line Out", 0),
         HDSPM_TX_64("TX 64 channels mode", 0),
         HDSPM_C_TMS("Clear Track Marker", 0),
         HDSPM_SAFE_MODE("Safe Mode", 0),
-        HDSPM_INPUT_SELECT("Input Select", 0),
+        HDSPM_INPUT_SELECT("Input Select", 0)
 };
 
-static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
 
+static struct snd_kcontrol_new snd_hdspm_controls_madiface[] = {
         HDSPM_MIXER("Mixer", 0),
-/* 'Sample Clock Source' complies with the alsa control naming scheme */
-        HDSPM_CLOCK_SOURCE("Sample Clock Source", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
+        HDSPM_SYNC_CHECK("MADI SyncCheck", 0),
+        HDSPM_TX_64("TX 64 channels mode", 0),
+        HDSPM_C_TMS("Clear Track Marker", 0),
+        HDSPM_SAFE_MODE("Safe Mode", 0)
+};
 
+static struct snd_kcontrol_new snd_hdspm_controls_aio[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
         HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
         HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
         HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
         HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
-/* 'External Rate' complies with the alsa control naming scheme */
         HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
-        HDSPM_WC_SYNC_CHECK("Word Clock Lock Status", 0),
-/*      HDSPM_AES_SYNC_CHECK("AES Lock Status", 0),*/ /* created in snd_hdspm_create_controls() */
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("AES SyncCheck", 1),
+        HDSPM_SYNC_CHECK("SPDIF SyncCheck", 2),
+        HDSPM_SYNC_CHECK("ADAT SyncCheck", 3),
+        HDSPM_SYNC_CHECK("TCO SyncCheck", 4),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SPDIF Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 5)
+
+                /*
+                   HDSPM_INPUT_SELECT("Input Select", 0),
+                   HDSPM_SPDIF_OPTICAL("SPDIF Out Optical", 0),
+                   HDSPM_PROFESSIONAL("SPDIF Out Professional", 0);
+                   HDSPM_SPDIF_IN("SPDIF In", 0);
+                   HDSPM_BREAKOUT_CABLE("Breakout Cable", 0);
+                   HDSPM_INPUT_LEVEL("Input Level", 0);
+                   HDSPM_OUTPUT_LEVEL("Output Level", 0);
+                   HDSPM_PHONES("Phones", 0);
+                   */
+};
+
+static struct snd_kcontrol_new snd_hdspm_controls_raydat[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("Clock Mode", 0),
+        HDSPM_PREF_SYNC_REF("Pref Sync Ref", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_SYNC_CHECK("WC SyncCheck", 0),
+        HDSPM_SYNC_CHECK("AES SyncCheck", 1),
+        HDSPM_SYNC_CHECK("SPDIF SyncCheck", 2),
+        HDSPM_SYNC_CHECK("ADAT1 SyncCheck", 3),
+        HDSPM_SYNC_CHECK("ADAT2 SyncCheck", 4),
+        HDSPM_SYNC_CHECK("ADAT3 SyncCheck", 5),
+        HDSPM_SYNC_CHECK("ADAT4 SyncCheck", 6),
+        HDSPM_SYNC_CHECK("TCO SyncCheck", 7),
+        HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 8),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SPDIF Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT1 Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT2 Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT3 Frequency", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("ADAT4 Frequency", 6),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 7),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 8)
+};
+
+static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
+        HDSPM_MIXER("Mixer", 0),
+        HDSPM_INTERNAL_CLOCK("Internal Clock", 0),
+        HDSPM_SYSTEM_CLOCK_MODE("System Clock Mode", 0),
+        HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
+        HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
+        HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
+        HDSPM_SYNC_CHECK("WC Sync Check", 0),
+        HDSPM_SYNC_CHECK("AES1 Sync Check", 1),
+        HDSPM_SYNC_CHECK("AES2 Sync Check", 2),
+        HDSPM_SYNC_CHECK("AES3 Sync Check", 3),
+        HDSPM_SYNC_CHECK("AES4 Sync Check", 4),
+        HDSPM_SYNC_CHECK("AES5 Sync Check", 5),
+        HDSPM_SYNC_CHECK("AES6 Sync Check", 6),
+        HDSPM_SYNC_CHECK("AES7 Sync Check", 7),
+        HDSPM_SYNC_CHECK("AES8 Sync Check", 8),
+        HDSPM_SYNC_CHECK("TCO Sync Check", 9),
+        HDSPM_SYNC_CHECK("SYNC IN Sync Check", 10),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("WC Frequency", 0),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES1 Frequency", 1),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES2 Frequency", 2),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES3 Frequency", 3),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES4 Frequency", 4),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES5 Frequency", 5),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES6 Frequency", 6),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES7 Frequency", 7),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("AES8 Frequency", 8),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("TCO Frequency", 9),
+        HDSPM_AUTOSYNC_SAMPLE_RATE("SYNC IN Frequency", 10),
         HDSPM_LINE_OUT("Line Out", 0),
         HDSPM_EMPHASIS("Emphasis", 0),
         HDSPM_DOLBY("Non Audio", 0),
@@ -2842,6 +4400,19 @@ static struct snd_kcontrol_new snd_hdspm_controls_aes32[] = {
         HDSPM_QS_WIRE("Quad Speed Wire Mode", 0),
 };
 
+
+
+/* Control elements for the optional TCO module */
+static struct snd_kcontrol_new snd_hdspm_controls_tco[] = {
+        HDSPM_TCO_SAMPLE_RATE("TCO Sample Rate", 0),
+        HDSPM_TCO_PULL("TCO Pull", 0),
+        HDSPM_TCO_WCK_CONVERSION("TCO WCK Conversion", 0),
+        HDSPM_TCO_FRAME_RATE("TCO Frame Rate", 0),
+        HDSPM_TCO_SYNC_SOURCE("TCO Sync Source", 0),
+        HDSPM_TCO_WORD_TERM("TCO Word Term", 0)
+};
+
+
 static struct snd_kcontrol_new snd_hdspm_playback_mixer = HDSPM_PLAYBACK_MIXER;
 
 
@@ -2849,78 +4420,76 @@ static int hdspm_update_simple_mixer_controls(struct hdspm * hdspm)
 {
         int i;
 
-        for (i = hdspm->ds_channels; i < hdspm->ss_channels; ++i) {
+        for (i = hdspm->ds_out_channels; i < hdspm->ss_out_channels; ++i) {
                 if (hdspm->system_sample_rate > 48000) {
                         hdspm->playback_mixer_ctls[i]->vd[0].access =
-                            SNDRV_CTL_ELEM_ACCESS_INACTIVE |
-                            SNDRV_CTL_ELEM_ACCESS_READ |
-                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                                SNDRV_CTL_ELEM_ACCESS_INACTIVE |
+                                SNDRV_CTL_ELEM_ACCESS_READ |
+                                SNDRV_CTL_ELEM_ACCESS_VOLATILE;
                 } else {
                         hdspm->playback_mixer_ctls[i]->vd[0].access =
-                            SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                            SNDRV_CTL_ELEM_ACCESS_VOLATILE;
+                                SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                                SNDRV_CTL_ELEM_ACCESS_VOLATILE;
                 }
                 snd_ctl_notify(hdspm->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                               SNDRV_CTL_EVENT_MASK_INFO,
-                               &hdspm->playback_mixer_ctls[i]->id);
+                                SNDRV_CTL_EVENT_MASK_INFO,
+                                &hdspm->playback_mixer_ctls[i]->id);
         }
 
         return 0;
 }
 
 
-static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm)
+static int snd_hdspm_create_controls(struct snd_card *card,
+                                        struct hdspm *hdspm)
 {
         unsigned int idx, limit;
         int err;
         struct snd_kcontrol *kctl;
+        struct snd_kcontrol_new *list = NULL;
 
-        /* add control list first */
-        if (hdspm->is_aes32) {
-                struct snd_kcontrol_new aes_sync_ctl =
-                        HDSPM_AES_SYNC_CHECK("AES Lock Status", 0);
+        switch (hdspm->io_type) {
+        case MADI:
+                list = snd_hdspm_controls_madi;
+                limit = ARRAY_SIZE(snd_hdspm_controls_madi);
+                break;
+        case MADIface:
+                list = snd_hdspm_controls_madiface;
+                limit = ARRAY_SIZE(snd_hdspm_controls_madiface);
+                break;
+        case AIO:
+                list = snd_hdspm_controls_aio;
+                limit = ARRAY_SIZE(snd_hdspm_controls_aio);
+                break;
+        case RayDAT:
+                list = snd_hdspm_controls_raydat;
+                limit = ARRAY_SIZE(snd_hdspm_controls_raydat);
+                break;
+        case AES32:
+                list = snd_hdspm_controls_aes32;
+                limit = ARRAY_SIZE(snd_hdspm_controls_aes32);
+                break;
+        }
 
-                for (idx = 0; idx < ARRAY_SIZE(snd_hdspm_controls_aes32);
-                     idx++) {
-                        err = snd_ctl_add(card,
-                                          snd_ctl_new1(&snd_hdspm_controls_aes32[idx],
-                                                       hdspm));
-                        if (err < 0)
-                                return err;
-                }
-                for (idx = 1; idx <= 8; idx++) {
-                        aes_sync_ctl.index = idx;
-                        err = snd_ctl_add(card,
-                                          snd_ctl_new1(&aes_sync_ctl, hdspm));
-                        if (err < 0)
-                                return err;
-                }
-        } else {
-                for (idx = 0; idx < ARRAY_SIZE(snd_hdspm_controls_madi);
-                     idx++) {
+        if (NULL != list) {
+                for (idx = 0; idx < limit; idx++) {
                         err = snd_ctl_add(card,
-                                          snd_ctl_new1(&snd_hdspm_controls_madi[idx],
-                                                       hdspm));
+                                        snd_ctl_new1(&list[idx], hdspm));
                         if (err < 0)
                                 return err;
                 }
         }
 
-        /* Channel playback mixer as default control 
-           Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders,
-           thats too * big for any alsamixer they are accessible via special
-           IOCTL on hwdep and the mixer 2dimensional mixer control
-        */
 
+        /* create simple 1:1 playback mixer controls */
         snd_hdspm_playback_mixer.name = "Chn";
-        limit = HDSPM_MAX_CHANNELS;
-
-        /* The index values are one greater than the channel ID so that
-         * alsamixer will display them correctly. We want to use the index
-         * for fast lookup of the relevant channel, but if we use it at all,
-         * most ALSA software does the wrong thing with it ...
-         */
-
+        if (hdspm->system_sample_rate >= 128000) {
+                limit = hdspm->qs_out_channels;
+        } else if (hdspm->system_sample_rate >= 64000) {
+                limit = hdspm->ds_out_channels;
+        } else {
+                limit = hdspm->ss_out_channels;
+        }
         for (idx = 0; idx < limit; ++idx) {
                 snd_hdspm_playback_mixer.index = idx + 1;
                 kctl = snd_ctl_new1(&snd_hdspm_playback_mixer, hdspm);
@@ -2930,11 +4499,24 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm
                 hdspm->playback_mixer_ctls[idx] = kctl;
         }
 
+
+        if (hdspm->tco) {
+                /* add tco control elements */
+                list = snd_hdspm_controls_tco;
+                limit = ARRAY_SIZE(snd_hdspm_controls_tco);
+                for (idx = 0; idx < limit; idx++) {
+                        err = snd_ctl_add(card,
+                                        snd_ctl_new1(&list[idx], hdspm));
+                        if (err < 0)
+                                return err;
+                }
+        }
+
         return 0;
 }
 
 /*------------------------------------------------------------
-   /proc interface 
+   /proc interface
  ------------------------------------------------------------*/
 
 static void
@@ -2942,72 +4524,178 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                          struct snd_info_buffer *buffer)
 {
         struct hdspm *hdspm = entry->private_data;
-        unsigned int status;
-        unsigned int status2;
+        unsigned int status, status2, control, freq;
+
         char *pref_sync_ref;
         char *autosync_ref;
         char *system_clock_mode;
-        char *clock_source;
         char *insel;
-        char *syncref;
         int x, x2;
 
+        /* TCO stuff */
+        int a, ltc, frames, seconds, minutes, hours;
+        unsigned int period;
+        u64 freq_const = 0;
+        u32 rate;
+
         status = hdspm_read(hdspm, HDSPM_statusRegister);
         status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+        control = hdspm->control_register;
+        freq = hdspm_read(hdspm, HDSPM_timecodeRegister);
 
         snd_iprintf(buffer, "%s (Card #%d) Rev.%x Status2first3bits: %x\n",
-                    hdspm->card_name, hdspm->card->number + 1,
-                    hdspm->firmware_rev,
-                    (status2 & HDSPM_version0) |
-                    (status2 & HDSPM_version1) | (status2 &
-                                                  HDSPM_version2));
+                        hdspm->card_name, hdspm->card->number + 1,
+                        hdspm->firmware_rev,
+                        (status2 & HDSPM_version0) |
+                        (status2 & HDSPM_version1) | (status2 &
+                                HDSPM_version2));
+
+        snd_iprintf(buffer, "HW Serial: 0x%06x%06x\n",
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn1)>>8) & 0xFFFFFF,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
 
         snd_iprintf(buffer, "IRQ: %d Registers bus: 0x%lx VM: 0x%lx\n",
-                    hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
+                        hdspm->irq, hdspm->port, (unsigned long)hdspm->iobase);
 
         snd_iprintf(buffer, "--- System ---\n");
 
         snd_iprintf(buffer,
-                    "IRQ Pending: Audio=%d, MIDI0=%d, MIDI1=%d, IRQcount=%d\n",
-                    status & HDSPM_audioIRQPending,
-                    (status & HDSPM_midi0IRQPending) ? 1 : 0,
-                    (status & HDSPM_midi1IRQPending) ? 1 : 0,
-                    hdspm->irq_count);
+                "IRQ Pending: Audio=%d, MIDI0=%d, MIDI1=%d, IRQcount=%d\n",
+                status & HDSPM_audioIRQPending,
+                (status & HDSPM_midi0IRQPending) ? 1 : 0,
+                (status & HDSPM_midi1IRQPending) ? 1 : 0,
+                hdspm->irq_count);
         snd_iprintf(buffer,
-                    "HW pointer: id = %d, rawptr = %d (%d->%d) "
-                    "estimated= %ld (bytes)\n",
-                    ((status & HDSPM_BufferID) ? 1 : 0),
-                    (status & HDSPM_BufferPositionMask),
-                    (status & HDSPM_BufferPositionMask) %
-                    (2 * (int)hdspm->period_bytes),
-                    ((status & HDSPM_BufferPositionMask) - 64) %
-                    (2 * (int)hdspm->period_bytes),
-                    (long) hdspm_hw_pointer(hdspm) * 4);
+                "HW pointer: id = %d, rawptr = %d (%d->%d) "
+                "estimated= %ld (bytes)\n",
+                ((status & HDSPM_BufferID) ? 1 : 0),
+                (status & HDSPM_BufferPositionMask),
+                (status & HDSPM_BufferPositionMask) %
+                (2 * (int)hdspm->period_bytes),
+                ((status & HDSPM_BufferPositionMask) - 64) %
+                (2 * (int)hdspm->period_bytes),
+                (long) hdspm_hw_pointer(hdspm) * 4);
 
         snd_iprintf(buffer,
-                    "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
-                    hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
-                    hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
+                "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
+                hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
         snd_iprintf(buffer,
-                    "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
-                    "status2=0x%x\n",
-                    hdspm->control_register, hdspm->control2_register,
-                    status, status2);
+                "MIDIoverMADI FIFO: In=0x%x, Out=0x%x \n",
+                hdspm_read(hdspm, HDSPM_midiStatusIn2) & 0xFF,
+                hdspm_read(hdspm, HDSPM_midiStatusOut2) & 0xFF);
+        snd_iprintf(buffer,
+                "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
+                "status2=0x%x\n",
+                hdspm->control_register, hdspm->control2_register,
+                status, status2);
+        if (status & HDSPM_tco_detect) {
+                snd_iprintf(buffer, "TCO module detected.\n");
+                a = hdspm_read(hdspm, HDSPM_RD_TCO+4);
+                if (a & HDSPM_TCO1_LTC_Input_valid) {
+                        snd_iprintf(buffer, "  LTC valid, ");
+                        switch (a & (HDSPM_TCO1_LTC_Format_LSB |
+                                                HDSPM_TCO1_LTC_Format_MSB)) {
+                        case 0:
+                                snd_iprintf(buffer, "24 fps, ");
+                                break;
+                        case HDSPM_TCO1_LTC_Format_LSB:
+                                snd_iprintf(buffer, "25 fps, ");
+                                break;
+                        case HDSPM_TCO1_LTC_Format_MSB:
+                                snd_iprintf(buffer, "29.97 fps, ");
+                                break;
+                        default:
+                                snd_iprintf(buffer, "30 fps, ");
+                                break;
+                        }
+                        if (a & HDSPM_TCO1_set_drop_frame_flag) {
+                                snd_iprintf(buffer, "drop frame\n");
+                        } else {
+                                snd_iprintf(buffer, "full frame\n");
+                        }
+                } else {
+                        snd_iprintf(buffer, "  no LTC\n");
+                }
+                if (a & HDSPM_TCO1_Video_Input_Format_NTSC) {
+                        snd_iprintf(buffer, "  Video: NTSC\n");
+                } else if (a & HDSPM_TCO1_Video_Input_Format_PAL) {
+                        snd_iprintf(buffer, "  Video: PAL\n");
+                } else {
+                        snd_iprintf(buffer, "  No video\n");
+                }
+                if (a & HDSPM_TCO1_TCO_lock) {
+                        snd_iprintf(buffer, "  Sync: lock\n");
+                } else {
+                        snd_iprintf(buffer, "  Sync: no lock\n");
+                }
+
+                switch (hdspm->io_type) {
+                case MADI:
+                case AES32:
+                        freq_const = 110069313433624ULL;
+                        break;
+                case RayDAT:
+                case AIO:
+                        freq_const = 104857600000000ULL;
+                        break;
+                case MADIface:
+                        break; /* no TCO possible */
+                }
+
+                period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+                snd_iprintf(buffer, "    period: %u\n", period);
+
+
+                /* rate = freq_const/period; */
+                rate = div_u64(freq_const, period);
+
+                if (control & HDSPM_QuadSpeed) {
+                        rate *= 4;
+                } else if (control & HDSPM_DoubleSpeed) {
+                        rate *= 2;
+                }
+
+                snd_iprintf(buffer, "  Frequency: %u Hz\n",
+                                (unsigned int) rate);
+
+                ltc = hdspm_read(hdspm, HDSPM_RD_TCO);
+                frames = ltc & 0xF;
+                ltc >>= 4;
+                frames += (ltc & 0x3) * 10;
+                ltc >>= 4;
+                seconds = ltc & 0xF;
+                ltc >>= 4;
+                seconds += (ltc & 0x7) * 10;
+                ltc >>= 4;
+                minutes = ltc & 0xF;
+                ltc >>= 4;
+                minutes += (ltc & 0x7) * 10;
+                ltc >>= 4;
+                hours = ltc & 0xF;
+                ltc >>= 4;
+                hours += (ltc & 0x3) * 10;
+                snd_iprintf(buffer,
+                        "  LTC In: %02d:%02d:%02d:%02d\n",
+                        hours, minutes, seconds, frames);
+
+        } else {
+                snd_iprintf(buffer, "No TCO module detected.\n");
+        }
 
         snd_iprintf(buffer, "--- Settings ---\n");
 
         x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
-                                           HDSPM_LatencyMask));
+                                                        HDSPM_LatencyMask));
 
         snd_iprintf(buffer,
-                    "Size (Latency): %d samples (2 periods of %lu bytes)\n",
-                    x, (unsigned long) hdspm->period_bytes);
+                "Size (Latency): %d samples (2 periods of %lu bytes)\n",
+                x, (unsigned long) hdspm->period_bytes);
 
-        snd_iprintf(buffer, "Line out: %s,   Precise Pointer: %s\n",
-                    (hdspm->control_register & HDSPM_LineOut) ? "on " : "off",
-                    (hdspm->precise_ptr) ? "on" : "off");
+        snd_iprintf(buffer, "Line out: %s\n",
+                (hdspm->control_register & HDSPM_LineOut) ? "on " : "off");
 
         switch (hdspm->control_register & HDSPM_InputMask) {
         case HDSPM_InputOptical:
@@ -3017,63 +4705,22 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 insel = "Coaxial";
                 break;
         default:
-                insel = "Unknown";
-        }
-
-        switch (hdspm->control_register & HDSPM_SyncRefMask) {
-        case HDSPM_SyncRef_Word:
-                syncref = "WordClock";
-                break;
-        case HDSPM_SyncRef_MADI:
-                syncref = "MADI";
-                break;
-        default:
-                syncref = "Unknown";
+                insel = "Unkown";
         }
-        snd_iprintf(buffer, "Inputsel = %s, SyncRef = %s\n", insel,
-                    syncref);
 
         snd_iprintf(buffer,
-                    "ClearTrackMarker = %s, Transmit in %s Channel Mode, "
-                    "Auto Input %s\n",
-                    (hdspm->
-                     control_register & HDSPM_clr_tms) ? "on" : "off",
-                    (hdspm->
-                     control_register & HDSPM_TX_64ch) ? "64" : "56",
-                    (hdspm->
-                     control_register & HDSPM_AutoInp) ? "on" : "off");
+                "ClearTrackMarker = %s, Transmit in %s Channel Mode, "
+                "Auto Input %s\n",
+                (hdspm->control_register & HDSPM_clr_tms) ? "on" : "off",
+                (hdspm->control_register & HDSPM_TX_64ch) ? "64" : "56",
+                (hdspm->control_register & HDSPM_AutoInp) ? "on" : "off");
+
 
-        switch (hdspm_clock_source(hdspm)) {
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                clock_source = "AutoSync";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                clock_source = "Internal 32 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                clock_source = "Internal 44.1 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                clock_source = "Internal 48 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                clock_source = "Internal 64 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                clock_source = "Internal 88.2 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                clock_source = "Internal 96 kHz";
-                break;
-        default:
-                clock_source = "Error";
-        }
-        snd_iprintf(buffer, "Sample Clock Source: %s\n", clock_source);
         if (!(hdspm->control_register & HDSPM_ClockModeMaster))
-                system_clock_mode = "Slave";
+                system_clock_mode = "AutoSync";
         else
                 system_clock_mode = "Master";
-        snd_iprintf(buffer, "System Clock Mode: %s\n", system_clock_mode);
+        snd_iprintf(buffer, "AutoSync Reference: %s\n", system_clock_mode);
 
         switch (hdspm_pref_sync_ref(hdspm)) {
         case HDSPM_SYNC_FROM_WORD:
@@ -3082,15 +4729,21 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
         case HDSPM_SYNC_FROM_MADI:
                 pref_sync_ref = "MADI Sync";
                 break;
+        case HDSPM_SYNC_FROM_TCO:
+                pref_sync_ref = "TCO";
+                break;
+        case HDSPM_SYNC_FROM_SYNC_IN:
+                pref_sync_ref = "Sync In";
+                break;
         default:
                 pref_sync_ref = "XXXX Clock";
                 break;
         }
         snd_iprintf(buffer, "Preferred Sync Reference: %s\n",
-                    pref_sync_ref);
+                        pref_sync_ref);
 
         snd_iprintf(buffer, "System Clock Frequency: %d\n",
-                    hdspm->system_sample_rate);
+                        hdspm->system_sample_rate);
 
 
         snd_iprintf(buffer, "--- Status:\n");
@@ -3099,12 +4752,18 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
         x2 = status2 & HDSPM_wcSync;
 
         snd_iprintf(buffer, "Inputs MADI=%s, WordClock=%s\n",
-                    (status & HDSPM_madiLock) ? (x ? "Sync" : "Lock") :
-                    "NoLock",
-                    (status2 & HDSPM_wcLock) ? (x2 ? "Sync" : "Lock") :
-                    "NoLock");
+                        (status & HDSPM_madiLock) ? (x ? "Sync" : "Lock") :
+                        "NoLock",
+                        (status2 & HDSPM_wcLock) ? (x2 ? "Sync" : "Lock") :
+                        "NoLock");
 
         switch (hdspm_autosync_ref(hdspm)) {
+        case HDSPM_AUTOSYNC_FROM_SYNC_IN:
+                autosync_ref = "Sync In";
+                break;
+        case HDSPM_AUTOSYNC_FROM_TCO:
+                autosync_ref = "TCO";
+                break;
         case HDSPM_AUTOSYNC_FROM_WORD:
                 autosync_ref = "Word Clock";
                 break;
@@ -3119,15 +4778,15 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry,
                 break;
         }
         snd_iprintf(buffer,
-                    "AutoSync: Reference= %s, Freq=%d (MADI = %d, Word = %d)\n",
-                    autosync_ref, hdspm_external_sample_rate(hdspm),
-                    (status & HDSPM_madiFreqMask) >> 22,
-                    (status2 & HDSPM_wcFreqMask) >> 5);
+                "AutoSync: Reference= %s, Freq=%d (MADI = %d, Word = %d)\n",
+                autosync_ref, hdspm_external_sample_rate(hdspm),
+                (status & HDSPM_madiFreqMask) >> 22,
+                (status2 & HDSPM_wcFreqMask) >> 5);
 
         snd_iprintf(buffer, "Input: %s, Mode=%s\n",
-                    (status & HDSPM_AB_int) ? "Coax" : "Optical",
-                    (status & HDSPM_RX_64ch) ? "64 channels" :
-                    "56 channels");
+                (status & HDSPM_AB_int) ? "Coax" : "Optical",
+                (status & HDSPM_RX_64ch) ? "64 channels" :
+                "56 channels");
 
         snd_iprintf(buffer, "\n");
 }
@@ -3142,8 +4801,6 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
         unsigned int timecode;
         int pref_syncref;
         char *autosync_ref;
-        char *system_clock_mode;
-        char *clock_source;
         int x;
 
         status = hdspm_read(hdspm, HDSPM_statusRegister);
@@ -3183,24 +4840,27 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                     hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
                     hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xFF);
         snd_iprintf(buffer,
-                    "Register: ctrl1=0x%x, status1=0x%x, status2=0x%x, "
-                    "timecode=0x%x\n",
-                    hdspm->control_register,
-                    status, status2, timecode);
+                    "MIDIoverMADI FIFO: In=0x%x, Out=0x%x \n",
+                    hdspm_read(hdspm, HDSPM_midiStatusIn2) & 0xFF,
+                    hdspm_read(hdspm, HDSPM_midiStatusOut2) & 0xFF);
+        snd_iprintf(buffer,
+                    "Register: ctrl1=0x%x, ctrl2=0x%x, status1=0x%x, "
+                    "status2=0x%x\n",
+                    hdspm->control_register, hdspm->control2_register,
+                    status, status2);
 
         snd_iprintf(buffer, "--- Settings ---\n");
 
         x = 1 << (6 + hdspm_decode_latency(hdspm->control_register &
-                                           HDSPM_LatencyMask));
+                                HDSPM_LatencyMask));
 
         snd_iprintf(buffer,
                     "Size (Latency): %d samples (2 periods of %lu bytes)\n",
                     x, (unsigned long) hdspm->period_bytes);
 
-        snd_iprintf(buffer, "Line out: %s,   Precise Pointer: %s\n",
+        snd_iprintf(buffer, "Line out: %s\n",
                     (hdspm->
-                     control_register & HDSPM_LineOut) ? "on " : "off",
-                    (hdspm->precise_ptr) ? "on" : "off");
+                     control_register & HDSPM_LineOut) ? "on " : "off");
 
         snd_iprintf(buffer,
                     "ClearTrackMarker %s, Emphasis %s, Dolby %s\n",
@@ -3211,46 +4871,6 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
                     (hdspm->
                      control_register & HDSPM_Dolby) ? "on" : "off");
 
-        switch (hdspm_clock_source(hdspm)) {
-        case HDSPM_CLOCK_SOURCE_AUTOSYNC:
-                clock_source = "AutoSync";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_32KHZ:
-                clock_source = "Internal 32 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_44_1KHZ:
-                clock_source = "Internal 44.1 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_48KHZ:
-                clock_source = "Internal 48 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_64KHZ:
-                clock_source = "Internal 64 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_88_2KHZ:
-                clock_source = "Internal 88.2 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_96KHZ:
-                clock_source = "Internal 96 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_128KHZ:
-                clock_source = "Internal 128 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_176_4KHZ:
-                clock_source = "Internal 176.4 kHz";
-                break;
-        case HDSPM_CLOCK_SOURCE_INTERNAL_192KHZ:
-                clock_source = "Internal 192 kHz";
-                break;
-        default:
-                clock_source = "Error";
-        }
-        snd_iprintf(buffer, "Sample Clock Source: %s\n", clock_source);
-        if (!(hdspm->control_register & HDSPM_ClockModeMaster))
-                system_clock_mode = "Slave";
-        else
-                system_clock_mode = "Master";
-        snd_iprintf(buffer, "System Clock Mode: %s\n", system_clock_mode);
 
         pref_syncref = hdspm_pref_sync_ref(hdspm);
         if (pref_syncref == 0)
@@ -3274,38 +4894,108 @@ snd_hdspm_proc_read_aes32(struct snd_info_entry * entry,
         snd_iprintf(buffer, "--- Status:\n");
 
         snd_iprintf(buffer, "Word: %s  Frequency: %d\n",
-                    (status & HDSPM_AES32_wcLock)? "Sync   " : "No Lock",
+                    (status & HDSPM_AES32_wcLock) ? "Sync   " : "No Lock",
                     HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF));
 
         for (x = 0; x < 8; x++) {
                 snd_iprintf(buffer, "AES%d: %s  Frequency: %d\n",
                             x+1,
                             (status2 & (HDSPM_LockAES >> x)) ?
-                            "Sync   ": "No Lock",
+                            "Sync   " : "No Lock",
                             HDSPM_bit2freq((timecode >> (4*x)) & 0xF));
         }
 
         switch (hdspm_autosync_ref(hdspm)) {
-        case HDSPM_AES32_AUTOSYNC_FROM_NONE: autosync_ref="None"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_WORD: autosync_ref="Word Clock"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES1: autosync_ref="AES1"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES2: autosync_ref="AES2"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES3: autosync_ref="AES3"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES4: autosync_ref="AES4"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES5: autosync_ref="AES5"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES6: autosync_ref="AES6"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES7: autosync_ref="AES7"; break;
-        case HDSPM_AES32_AUTOSYNC_FROM_AES8: autosync_ref="AES8"; break;
-        default: autosync_ref = "---"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_NONE:
+                autosync_ref = "None"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_WORD:
+                autosync_ref = "Word Clock"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES1:
+                autosync_ref = "AES1"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES2:
+                autosync_ref = "AES2"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES3:
+                autosync_ref = "AES3"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES4:
+                autosync_ref = "AES4"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES5:
+                autosync_ref = "AES5"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES6:
+                autosync_ref = "AES6"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES7:
+                autosync_ref = "AES7"; break;
+        case HDSPM_AES32_AUTOSYNC_FROM_AES8:
+                autosync_ref = "AES8"; break;
+        default:
+                autosync_ref = "---"; break;
         }
         snd_iprintf(buffer, "AutoSync ref = %s\n", autosync_ref);
 
         snd_iprintf(buffer, "\n");
 }
 
+static void
+snd_hdspm_proc_read_raydat(struct snd_info_entry *entry,
+                         struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        unsigned int status1, status2, status3, control, i;
+        unsigned int lock, sync;
+
+        status1 = hdspm_read(hdspm, HDSPM_RD_STATUS_1); /* s1 */
+        status2 = hdspm_read(hdspm, HDSPM_RD_STATUS_2); /* freq */
+        status3 = hdspm_read(hdspm, HDSPM_RD_STATUS_3); /* s2 */
+
+        control = hdspm->control_register;
+
+        snd_iprintf(buffer, "STATUS1: 0x%08x\n", status1);
+        snd_iprintf(buffer, "STATUS2: 0x%08x\n", status2);
+        snd_iprintf(buffer, "STATUS3: 0x%08x\n", status3);
+
+
+        snd_iprintf(buffer, "\n*** CLOCK MODE\n\n");
+
+        snd_iprintf(buffer, "Clock mode      : %s\n",
+                (hdspm_system_clock_mode(hdspm) == 0) ? "master" : "slave");
+        snd_iprintf(buffer, "System frequency: %d Hz\n",
+                hdspm_get_system_sample_rate(hdspm));
+
+        snd_iprintf(buffer, "\n*** INPUT STATUS\n\n");
+
+        lock = 0x1;
+        sync = 0x100;
+
+        for (i = 0; i < 8; i++) {
+                snd_iprintf(buffer, "s1_input %d: Lock %d, Sync %d, Freq %s\n",
+                                i,
+                                (status1 & lock) ? 1 : 0,
+                                (status1 & sync) ? 1 : 0,
+                                texts_freq[(status2 >> (i * 4)) & 0xF]);
+
+                lock = lock<<1;
+                sync = sync<<1;
+        }
+
+        snd_iprintf(buffer, "WC input: Lock %d, Sync %d, Freq %s\n",
+                        (status1 & 0x1000000) ? 1 : 0,
+                        (status1 & 0x2000000) ? 1 : 0,
+                        texts_freq[(status1 >> 16) & 0xF]);
+
+        snd_iprintf(buffer, "TCO input: Lock %d, Sync %d, Freq %s\n",
+                        (status1 & 0x4000000) ? 1 : 0,
+                        (status1 & 0x8000000) ? 1 : 0,
+                        texts_freq[(status1 >> 20) & 0xF]);
+
+        snd_iprintf(buffer, "SYNC IN: Lock %d, Sync %d, Freq %s\n",
+                        (status3 & 0x400) ? 1 : 0,
+                        (status3 & 0x800) ? 1 : 0,
+                        texts_freq[(status2 >> 12) & 0xF]);
+
+}
+
 #ifdef CONFIG_SND_DEBUG
 static void
-snd_hdspm_proc_read_debug(struct snd_info_entry * entry,
+snd_hdspm_proc_read_debug(struct snd_info_entry *entry,
                           struct snd_info_buffer *buffer)
 {
         struct hdspm *hdspm = entry->private_data;
@@ -3322,16 +5012,68 @@ snd_hdspm_proc_read_debug(struct snd_info_entry * entry,
 #endif
 
 
+static void snd_hdspm_proc_ports_in(struct snd_info_entry *entry,
+                          struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        int i;
+
+        snd_iprintf(buffer, "# generated by hdspm\n");
+
+        for (i = 0; i < hdspm->max_channels_in; i++) {
+                snd_iprintf(buffer, "%d=%s\n", i+1, hdspm->port_names_in[i]);
+        }
+}
 
-static void __devinit snd_hdspm_proc_init(struct hdspm * hdspm)
+static void snd_hdspm_proc_ports_out(struct snd_info_entry *entry,
+                          struct snd_info_buffer *buffer)
+{
+        struct hdspm *hdspm = entry->private_data;
+        int i;
+
+        snd_iprintf(buffer, "# generated by hdspm\n");
+
+        for (i = 0; i < hdspm->max_channels_out; i++) {
+                snd_iprintf(buffer, "%d=%s\n", i+1, hdspm->port_names_out[i]);
+        }
+}
+
+
+static void __devinit snd_hdspm_proc_init(struct hdspm *hdspm)
 {
         struct snd_info_entry *entry;
 
-        if (!snd_card_proc_new(hdspm->card, "hdspm", &entry))
-                snd_info_set_text_ops(entry, hdspm,
-                                      hdspm->is_aes32 ?
-                                      snd_hdspm_proc_read_aes32 :
-                                      snd_hdspm_proc_read_madi);
+        if (!snd_card_proc_new(hdspm->card, "hdspm", &entry)) {
+                switch (hdspm->io_type) {
+                case AES32:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_aes32);
+                        break;
+                case MADI:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_madi);
+                        break;
+                case MADIface:
+                        /* snd_info_set_text_ops(entry, hdspm,
+                         snd_hdspm_proc_read_madiface); */
+                        break;
+                case RayDAT:
+                        snd_info_set_text_ops(entry, hdspm,
+                                        snd_hdspm_proc_read_raydat);
+                        break;
+                case AIO:
+                        break;
+                }
+        }
+
+        if (!snd_card_proc_new(hdspm->card, "ports.in", &entry)) {
+                snd_info_set_text_ops(entry, hdspm, snd_hdspm_proc_ports_in);
+        }
+
+        if (!snd_card_proc_new(hdspm->card, "ports.out", &entry)) {
+                snd_info_set_text_ops(entry, hdspm, snd_hdspm_proc_ports_out);
+        }
+
 #ifdef CONFIG_SND_DEBUG
         /* debug file to read all hdspm registers */
         if (!snd_card_proc_new(hdspm->card, "debug", &entry))
@@ -3341,47 +5083,48 @@ static void __devinit snd_hdspm_proc_init(struct hdspm * hdspm)
 }
 
 /*------------------------------------------------------------
-   hdspm intitialize 
+   hdspm intitialize
  ------------------------------------------------------------*/
 
 static int snd_hdspm_set_defaults(struct hdspm * hdspm)
 {
-        unsigned int i;
-
         /* ASSUMPTION: hdspm->lock is either held, or there is no need to
            hold it (e.g. during module initialization).
-         */
+           */
 
         /* set defaults:       */
 
-        if (hdspm->is_aes32)
+        hdspm->settings_register = 0;
+
+        switch (hdspm->io_type) {
+        case MADI:
+        case MADIface:
+                hdspm->control_register =
+                        0x2 + 0x8 + 0x10 + 0x80 + 0x400 + 0x4000 + 0x1000000;
+                break;
+
+        case RayDAT:
+        case AIO:
+                hdspm->settings_register = 0x1 + 0x1000;
+                /* Magic values are: LAT_0, LAT_2, Master, freq1, tx64ch, inp_0,
+                 * line_out */
+                hdspm->control_register =
+                        0x2 + 0x8 + 0x10 + 0x80 + 0x400 + 0x4000 + 0x1000000;
+                break;
+
+        case AES32:
                 hdspm->control_register =
                         HDSPM_ClockModeMaster | /* Master Cloack Mode on */
-                        hdspm_encode_latency(7) | /* latency maximum =
-                                                   * 8192 samples
-                                                   */
+                        hdspm_encode_latency(7) | /* latency max=8192samples */
                         HDSPM_SyncRef0 |        /* AES1 is syncclock */
                         HDSPM_LineOut | /* Analog output in */
                         HDSPM_Professional;  /* Professional mode */
-        else
-                hdspm->control_register =
-                        HDSPM_ClockModeMaster | /* Master Cloack Mode on */
-                        hdspm_encode_latency(7) | /* latency maximum =
-                                                   * 8192 samples
-                                                   */
-                        HDSPM_InputCoaxial |    /* Input Coax not Optical */
-                        HDSPM_SyncRef_MADI |    /* Madi is syncclock */
-                        HDSPM_LineOut | /* Analog output in */
-                        HDSPM_TX_64ch | /* transmit in 64ch mode */
-                        HDSPM_AutoInp;  /* AutoInput chossing (takeover) */
-
-        /* ! HDSPM_Frequency0|HDSPM_Frequency1 = 44.1khz */
-        /* !  HDSPM_DoubleSpeed HDSPM_QuadSpeed = normal speed */
-        /* ! HDSPM_clr_tms = do not clear bits in track marks */
+                break;
+        }
 
         hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
 
-        if (!hdspm->is_aes32) {
+        if (AES32 == hdspm->io_type) {
                 /* No control2 register for AES32 */
 #ifdef SNDRV_BIG_ENDIAN
                 hdspm->control2_register = HDSPM_BIGENDIAN_MODE;
@@ -3397,57 +5140,59 @@ static int snd_hdspm_set_defaults(struct hdspm * hdspm)
 
         all_in_all_mixer(hdspm, 0 * UNITY_GAIN);
 
-        if (line_outs_monitor[hdspm->dev]) {
-
-                snd_printk(KERN_INFO "HDSPM: "
-                           "sending all playback streams to line outs.\n");
-
-                for (i = 0; i < HDSPM_MIXER_CHANNELS; i++) {
-                        if (hdspm_write_pb_gain(hdspm, i, i, UNITY_GAIN))
-                                return -EIO;
-                }
+        if (hdspm->io_type == AIO || hdspm->io_type == RayDAT) {
+                hdspm_write(hdspm, HDSPM_WR_SETTINGS, hdspm->settings_register);
         }
 
         /* set a default rate so that the channel map is set up. */
-        hdspm->channel_map = channel_map_madi_ss;
-        hdspm_set_rate(hdspm, 44100, 1);
+        hdspm_set_rate(hdspm, 48000, 1);
 
         return 0;
 }
 
 
 /*------------------------------------------------------------
-   interrupt 
+   interrupt
  ------------------------------------------------------------*/
 
 static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
 {
         struct hdspm *hdspm = (struct hdspm *) dev_id;
         unsigned int status;
-        int audio;
-        int midi0;
-        int midi1;
-        unsigned int midi0status;
-        unsigned int midi1status;
-        int schedule = 0;
+        int i, audio, midi, schedule = 0;
+        /* cycles_t now; */
 
         status = hdspm_read(hdspm, HDSPM_statusRegister);
 
         audio = status & HDSPM_audioIRQPending;
-        midi0 = status & HDSPM_midi0IRQPending;
-        midi1 = status & HDSPM_midi1IRQPending;
+        midi = status & (HDSPM_midi0IRQPending | HDSPM_midi1IRQPending |
+                        HDSPM_midi2IRQPending | HDSPM_midi3IRQPending);
+
+        /* now = get_cycles(); */
+        /**
+         *   LAT_2..LAT_0 period  counter (win)  counter (mac)
+         *          6       4096   ~256053425     ~514672358
+         *          5       2048   ~128024983     ~257373821
+         *          4       1024    ~64023706     ~128718089
+         *          3        512    ~32005945      ~64385999
+         *          2        256    ~16003039      ~32260176
+         *          1        128     ~7998738      ~16194507
+         *          0         64     ~3998231       ~8191558
+         **/
+        /*
+           snd_printk(KERN_INFO "snd_hdspm_interrupt %llu @ %llx\n",
+           now-hdspm->last_interrupt, status & 0xFFC0);
+           hdspm->last_interrupt = now;
+        */
 
-        if (!audio && !midi0 && !midi1)
+        if (!audio && !midi)
                 return IRQ_NONE;
 
         hdspm_write(hdspm, HDSPM_interruptConfirmation, 0);
         hdspm->irq_count++;
 
-        midi0status = hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xff;
-        midi1status = hdspm_read(hdspm, HDSPM_midiStatusIn1) & 0xff;
 
         if (audio) {
-
                 if (hdspm->capture_substream)
                         snd_pcm_period_elapsed(hdspm->capture_substream);
 
@@ -3455,118 +5200,44 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
                         snd_pcm_period_elapsed(hdspm->playback_substream);
         }
 
-        if (midi0 && midi0status) {
-                /* we disable interrupts for this input until processing
-                 * is done
-                 */
-                hdspm->control_register &= ~HDSPM_Midi0InterruptEnable;
-                hdspm_write(hdspm, HDSPM_controlRegister,
-                            hdspm->control_register);
-                hdspm->midi[0].pending = 1;
-                schedule = 1;
-        }
-        if (midi1 && midi1status) {
-                /* we disable interrupts for this input until processing
-                 * is done
-                 */
-                hdspm->control_register &= ~HDSPM_Midi1InterruptEnable;
-                hdspm_write(hdspm, HDSPM_controlRegister,
-                            hdspm->control_register);
-                hdspm->midi[1].pending = 1;
-                schedule = 1;
+        if (midi) {
+                i = 0;
+                while (i < hdspm->midiPorts) {
+                        if ((hdspm_read(hdspm,
+                                hdspm->midi[i].statusIn) & 0xff) &&
+                                        (status & hdspm->midi[i].irq)) {
+                                /* we disable interrupts for this input until
+                                 * processing is done
+                                 */
+                                hdspm->control_register &= ~hdspm->midi[i].ie;
+                                hdspm_write(hdspm, HDSPM_controlRegister,
+                                                hdspm->control_register);
+                                hdspm->midi[i].pending = 1;
+                                schedule = 1;
+                        }
+
+                        i++;
+                }
+
+                if (schedule)
+                        tasklet_hi_schedule(&hdspm->midi_tasklet);
         }
-        if (schedule)
-                tasklet_schedule(&hdspm->midi_tasklet);
+
         return IRQ_HANDLED;
 }
 
 /*------------------------------------------------------------
-   pcm interface 
+   pcm interface
   ------------------------------------------------------------*/
 
 
-static snd_pcm_uframes_t snd_hdspm_hw_pointer(struct snd_pcm_substream *
-                                              substream)
+static snd_pcm_uframes_t snd_hdspm_hw_pointer(struct snd_pcm_substream
+                                              *substream)
 {
         struct hdspm *hdspm = snd_pcm_substream_chip(substream);
         return hdspm_hw_pointer(hdspm);
 }
 
-static char *hdspm_channel_buffer_location(struct hdspm * hdspm,
-                                           int stream, int channel)
-{
-        int mapped_channel;
-
-        if (snd_BUG_ON(channel < 0 || channel >= HDSPM_MAX_CHANNELS))
-                return NULL;
-
-        mapped_channel = hdspm->channel_map[channel];
-        if (mapped_channel < 0)
-                return NULL;
-
-        if (stream == SNDRV_PCM_STREAM_CAPTURE)
-                return hdspm->capture_buffer +
-                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-        else
-                return hdspm->playback_buffer +
-                    mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
-}
-
-
-/* dont know why need it ??? */
-static int snd_hdspm_playback_copy(struct snd_pcm_substream *substream,
-                                   int channel, snd_pcm_uframes_t pos,
-                                   void __user *src, snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        if (snd_BUG_ON(pos + count > HDSPM_CHANNEL_BUFFER_BYTES / 4))
-                return -EINVAL;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-
-        return copy_from_user(channel_buf + pos * 4, src, count * 4);
-}
-
-static int snd_hdspm_capture_copy(struct snd_pcm_substream *substream,
-                                  int channel, snd_pcm_uframes_t pos,
-                                  void __user *dst, snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        if (snd_BUG_ON(pos + count > HDSPM_CHANNEL_BUFFER_BYTES / 4))
-                return -EINVAL;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-        return copy_to_user(dst, channel_buf + pos * 4, count * 4);
-}
-
-static int snd_hdspm_hw_silence(struct snd_pcm_substream *substream,
-                                int channel, snd_pcm_uframes_t pos,
-                                snd_pcm_uframes_t count)
-{
-        struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        char *channel_buf;
-
-        channel_buf =
-                hdspm_channel_buffer_location(hdspm, substream->pstr->stream,
-                                              channel);
-        if (snd_BUG_ON(!channel_buf))
-                return -EIO;
-        memset(channel_buf + pos * 4, 0, count * 4);
-        return 0;
-}
 
 static int snd_hdspm_reset(struct snd_pcm_substream *substream)
 {
@@ -3589,7 +5260,7 @@ static int snd_hdspm_reset(struct snd_pcm_substream *substream)
                 snd_pcm_group_for_each_entry(s, substream) {
                         if (s == other) {
                                 oruntime->status->hw_ptr =
-                                    runtime->status->hw_ptr;
+                                        runtime->status->hw_ptr;
                                 break;
                         }
                 }
@@ -3621,19 +5292,19 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                 /* The other stream is open, and not by the same
                    task as this one. Make sure that the parameters
                    that matter are the same.
-                 */
+                   */
 
                 if (params_rate(params) != hdspm->system_sample_rate) {
                         spin_unlock_irq(&hdspm->lock);
                         _snd_pcm_hw_param_setempty(params,
-                                                   SNDRV_PCM_HW_PARAM_RATE);
+                                        SNDRV_PCM_HW_PARAM_RATE);
                         return -EBUSY;
                 }
 
                 if (params_period_size(params) != hdspm->period_bytes / 4) {
                         spin_unlock_irq(&hdspm->lock);
                         _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                                        SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
                         return -EBUSY;
                 }
 
@@ -3646,18 +5317,20 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         spin_lock_irq(&hdspm->lock);
         err = hdspm_set_rate(hdspm, params_rate(params), 0);
         if (err < 0) {
+                snd_printk(KERN_INFO "err on hdspm_set_rate: %d\n", err);
                 spin_unlock_irq(&hdspm->lock);
                 _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_RATE);
+                                SNDRV_PCM_HW_PARAM_RATE);
                 return err;
         }
         spin_unlock_irq(&hdspm->lock);
 
         err = hdspm_set_interrupt_interval(hdspm,
-                                           params_period_size(params));
+                        params_period_size(params));
         if (err < 0) {
+                snd_printk(KERN_INFO "err on hdspm_set_interrupt_interval: %d\n", err);
                 _snd_pcm_hw_param_setempty(params,
-                                           SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
                 return err;
         }
 
@@ -3667,10 +5340,13 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
         /* malloc all buffer even if not enabled to get sure */
         /* Update for MADI rev 204: we need to allocate for all channels,
          * otherwise it doesn't work at 96kHz */
+
         err =
-            snd_pcm_lib_malloc_pages(substream, HDSPM_DMA_AREA_BYTES);
-        if (err < 0)
+                snd_pcm_lib_malloc_pages(substream, HDSPM_DMA_AREA_BYTES);
+        if (err < 0) {
+                snd_printk(KERN_INFO "err on snd_pcm_lib_malloc_pages: %d\n", err);
                 return err;
+        }
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 
@@ -3681,7 +5357,7 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                         snd_hdspm_enable_out(hdspm, i, 1);
 
                 hdspm->playback_buffer =
-                    (unsigned char *) substream->runtime->dma_area;
+                        (unsigned char *) substream->runtime->dma_area;
                 snd_printdd("Allocated sample buffer for playback at %p\n",
                                 hdspm->playback_buffer);
         } else {
@@ -3692,23 +5368,40 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
                         snd_hdspm_enable_in(hdspm, i, 1);
 
                 hdspm->capture_buffer =
-                    (unsigned char *) substream->runtime->dma_area;
+                        (unsigned char *) substream->runtime->dma_area;
                 snd_printdd("Allocated sample buffer for capture at %p\n",
                                 hdspm->capture_buffer);
         }
+
         /*
            snd_printdd("Allocated sample buffer for %s at 0x%08X\n",
            substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
            "playback" : "capture",
            snd_pcm_sgbuf_get_addr(substream, 0));
-         */
+           */
         /*
-        snd_printdd("set_hwparams: %s %d Hz, %d channels, bs = %d\n",
-                        substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
-                          "playback" : "capture",
-                        params_rate(params), params_channels(params),
-                        params_buffer_size(params));
-        */
+           snd_printdd("set_hwparams: %s %d Hz, %d channels, bs = %d\n",
+           substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
+           "playback" : "capture",
+           params_rate(params), params_channels(params),
+           params_buffer_size(params));
+           */
+
+
+        /* Switch to native float format if requested */
+        if (SNDRV_PCM_FORMAT_FLOAT_LE == params_format(params)) {
+                if (!(hdspm->control_register & HDSPe_FLOAT_FORMAT))
+                        snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE float format.\n");
+
+                hdspm->control_register |= HDSPe_FLOAT_FORMAT;
+        } else if (SNDRV_PCM_FORMAT_S32_LE == params_format(params)) {
+                if (hdspm->control_register & HDSPe_FLOAT_FORMAT)
+                        snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE integer format.\n");
+
+                hdspm->control_register &= ~HDSPe_FLOAT_FORMAT;
+        }
+        hdspm_write(hdspm, HDSPM_controlRegister, hdspm->control_register);
+
         return 0;
 }
 
@@ -3719,14 +5412,14 @@ static int snd_hdspm_hw_free(struct snd_pcm_substream *substream)
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 
-                /* params_channels(params) should be enough, 
+                /* params_channels(params) should be enough,
                    but to get sure in case of error */
-                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                for (i = 0; i < hdspm->max_channels_out; ++i)
                         snd_hdspm_enable_out(hdspm, i, 0);
 
                 hdspm->playback_buffer = NULL;
         } else {
-                for (i = 0; i < HDSPM_MAX_CHANNELS; ++i)
+                for (i = 0; i < hdspm->max_channels_in; ++i)
                         snd_hdspm_enable_in(hdspm, i, 0);
 
                 hdspm->capture_buffer = NULL;
@@ -3738,37 +5431,58 @@ static int snd_hdspm_hw_free(struct snd_pcm_substream *substream)
         return 0;
 }
 
+
 static int snd_hdspm_channel_info(struct snd_pcm_substream *substream,
-                                  struct snd_pcm_channel_info * info)
+                struct snd_pcm_channel_info *info)
 {
         struct hdspm *hdspm = snd_pcm_substream_chip(substream);
-        int mapped_channel;
 
-        if (snd_BUG_ON(info->channel >= HDSPM_MAX_CHANNELS))
-                return -EINVAL;
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                if (snd_BUG_ON(info->channel >= hdspm->max_channels_out)) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel out of range (%d)\n", info->channel);
+                        return -EINVAL;
+                }
 
-        mapped_channel = hdspm->channel_map[info->channel];
-        if (mapped_channel < 0)
-                return -EINVAL;
+                if (hdspm->channel_map_out[info->channel] < 0) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel %d mapped out\n", info->channel);
+                        return -EINVAL;
+                }
+
+                info->offset = hdspm->channel_map_out[info->channel] *
+                        HDSPM_CHANNEL_BUFFER_BYTES;
+        } else {
+                if (snd_BUG_ON(info->channel >= hdspm->max_channels_in)) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel out of range (%d)\n", info->channel);
+                        return -EINVAL;
+                }
+
+                if (hdspm->channel_map_in[info->channel] < 0) {
+                        snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel %d mapped out\n", info->channel);
+                        return -EINVAL;
+                }
+
+                info->offset = hdspm->channel_map_in[info->channel] *
+                        HDSPM_CHANNEL_BUFFER_BYTES;
+        }
 
-        info->offset = mapped_channel * HDSPM_CHANNEL_BUFFER_BYTES;
         info->first = 0;
         info->step = 32;
         return 0;
 }
 
+
 static int snd_hdspm_ioctl(struct snd_pcm_substream *substream,
-                           unsigned int cmd, void *arg)
+                unsigned int cmd, void *arg)
 {
         switch (cmd) {
         case SNDRV_PCM_IOCTL1_RESET:
                 return snd_hdspm_reset(substream);
 
         case SNDRV_PCM_IOCTL1_CHANNEL_INFO:
-        {
-                struct snd_pcm_channel_info *info = arg;
-                return snd_hdspm_channel_info(substream, info);
-        }
+                {
+                        struct snd_pcm_channel_info *info = arg;
+                        return snd_hdspm_channel_info(substream, info);
+                }
         default:
                 break;
         }
@@ -3815,19 +5529,19 @@ static int snd_hdspm_trigger(struct snd_pcm_substream *substream, int cmd)
                 }
                 if (cmd == SNDRV_PCM_TRIGGER_START) {
                         if (!(running & (1 << SNDRV_PCM_STREAM_PLAYBACK))
-                            && substream->stream ==
-                            SNDRV_PCM_STREAM_CAPTURE)
+                                        && substream->stream ==
+                                        SNDRV_PCM_STREAM_CAPTURE)
                                 hdspm_silence_playback(hdspm);
                 } else {
                         if (running &&
-                            substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                                substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                                 hdspm_silence_playback(hdspm);
                 }
         } else {
                 if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
                         hdspm_silence_playback(hdspm);
         }
-      _ok:
+_ok:
         snd_pcm_trigger_done(substream, substream);
         if (!hdspm->running && running)
                 hdspm_start_audio(hdspm);
@@ -3844,8 +5558,18 @@ static int snd_hdspm_prepare(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static unsigned int period_sizes[] =
-    { 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
+static unsigned int period_sizes_old[] = {
+        64, 128, 256, 512, 1024, 2048, 4096
+};
+
+static unsigned int period_sizes_new[] = {
+        32, 64, 128, 256, 512, 1024, 2048, 4096
+};
+
+/* RayDAT and AIO always have a buffer of 16384 samples per channel */
+static unsigned int raydat_aio_buffer_sizes[] = {
+        16384
+};
 
 static struct snd_pcm_hardware snd_hdspm_playback_subinfo = {
         .info = (SNDRV_PCM_INFO_MMAP |
@@ -3866,9 +5590,9 @@ static struct snd_pcm_hardware snd_hdspm_playback_subinfo = {
         .buffer_bytes_max =
             HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
         .period_bytes_min = (64 * 4),
-        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .period_bytes_max = (4096 * 4) * HDSPM_MAX_CHANNELS,
         .periods_min = 2,
-        .periods_max = 2,
+        .periods_max = 512,
         .fifo_size = 0
 };
 
@@ -3891,20 +5615,66 @@ static struct snd_pcm_hardware snd_hdspm_capture_subinfo = {
         .buffer_bytes_max =
             HDSPM_CHANNEL_BUFFER_BYTES * HDSPM_MAX_CHANNELS,
         .period_bytes_min = (64 * 4),
-        .period_bytes_max = (8192 * 4) * HDSPM_MAX_CHANNELS,
+        .period_bytes_max = (4096 * 4) * HDSPM_MAX_CHANNELS,
         .periods_min = 2,
-        .periods_max = 2,
+        .periods_max = 512,
         .fifo_size = 0
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = {
-        .count = ARRAY_SIZE(period_sizes),
-        .list = period_sizes,
+static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes_old = {
+        .count = ARRAY_SIZE(period_sizes_old),
+        .list = period_sizes_old,
         .mask = 0
 };
 
+static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes_new = {
+        .count = ARRAY_SIZE(period_sizes_new),
+        .list = period_sizes_new,
+        .mask = 0
+};
 
-static int snd_hdspm_hw_rule_channels_rate(struct snd_pcm_hw_params *params,
+static struct snd_pcm_hw_constraint_list hw_constraints_raydat_io_buffer = {
+        .count = ARRAY_SIZE(raydat_aio_buffer_sizes),
+        .list = raydat_aio_buffer_sizes,
+        .mask = 0
+};
+
+static int snd_hdspm_hw_rule_in_channels_rate(struct snd_pcm_hw_params *params,
+                                           struct snd_pcm_hw_rule *rule)
+{
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        struct snd_interval *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (r->min > 96000 && r->max <= 192000) {
+                struct snd_interval t = {
+                        .min = hdspm->qs_in_channels,
+                        .max = hdspm->qs_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->min > 48000 && r->max <= 96000) {
+                struct snd_interval t = {
+                        .min = hdspm->ds_in_channels,
+                        .max = hdspm->ds_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->max < 64000) {
+                struct snd_interval t = {
+                        .min = hdspm->ss_in_channels,
+                        .max = hdspm->ss_in_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        }
+
+        return 0;
+}
+
+static int snd_hdspm_hw_rule_out_channels_rate(struct snd_pcm_hw_params *params,
                                            struct snd_pcm_hw_rule * rule)
 {
         struct hdspm *hdspm = rule->private;
@@ -3913,25 +5683,33 @@ static int snd_hdspm_hw_rule_channels_rate(struct snd_pcm_hw_params *params,
         struct snd_interval *r =
             hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
 
-        if (r->min > 48000 && r->max <= 96000) {
+        if (r->min > 96000 && r->max <= 192000) {
                 struct snd_interval t = {
-                        .min = hdspm->ds_channels,
-                        .max = hdspm->ds_channels,
+                        .min = hdspm->qs_out_channels,
+                        .max = hdspm->qs_out_channels,
+                        .integer = 1,
+                };
+                return snd_interval_refine(c, &t);
+        } else if (r->min > 48000 && r->max <= 96000) {
+                struct snd_interval t = {
+                        .min = hdspm->ds_out_channels,
+                        .max = hdspm->ds_out_channels,
                         .integer = 1,
                 };
                 return snd_interval_refine(c, &t);
         } else if (r->max < 64000) {
                 struct snd_interval t = {
-                        .min = hdspm->ss_channels,
-                        .max = hdspm->ss_channels,
+                        .min = hdspm->ss_out_channels,
+                        .max = hdspm->ss_out_channels,
                         .integer = 1,
                 };
                 return snd_interval_refine(c, &t);
+        } else {
         }
         return 0;
 }
 
-static int snd_hdspm_hw_rule_rate_channels(struct snd_pcm_hw_params *params,
+static int snd_hdspm_hw_rule_rate_in_channels(struct snd_pcm_hw_params *params,
                                            struct snd_pcm_hw_rule * rule)
 {
         struct hdspm *hdspm = rule->private;
@@ -3940,42 +5718,92 @@ static int snd_hdspm_hw_rule_rate_channels(struct snd_pcm_hw_params *params,
         struct snd_interval *r =
             hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
 
-        if (c->min >= hdspm->ss_channels) {
+        if (c->min >= hdspm->ss_in_channels) {
                 struct snd_interval t = {
                         .min = 32000,
                         .max = 48000,
                         .integer = 1,
                 };
                 return snd_interval_refine(r, &t);
-        } else if (c->max <= hdspm->ds_channels) {
+        } else if (c->max <= hdspm->qs_in_channels) {
+                struct snd_interval t = {
+                        .min = 128000,
+                        .max = 192000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->ds_in_channels) {
                 struct snd_interval t = {
                         .min = 64000,
                         .max = 96000,
                         .integer = 1,
                 };
+                return snd_interval_refine(r, &t);
+        }
 
+        return 0;
+}
+static int snd_hdspm_hw_rule_rate_out_channels(struct snd_pcm_hw_params *params,
+                                           struct snd_pcm_hw_rule *rule)
+{
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+        struct snd_interval *r =
+            hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+
+        if (c->min >= hdspm->ss_out_channels) {
+                struct snd_interval t = {
+                        .min = 32000,
+                        .max = 48000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->qs_out_channels) {
+                struct snd_interval t = {
+                        .min = 128000,
+                        .max = 192000,
+                        .integer = 1,
+                };
+                return snd_interval_refine(r, &t);
+        } else if (c->max <= hdspm->ds_out_channels) {
+                struct snd_interval t = {
+                        .min = 64000,
+                        .max = 96000,
+                        .integer = 1,
+                };
                 return snd_interval_refine(r, &t);
         }
+
         return 0;
 }
 
-static int snd_hdspm_hw_rule_channels(struct snd_pcm_hw_params *params,
+static int snd_hdspm_hw_rule_in_channels(struct snd_pcm_hw_params *params,
                                       struct snd_pcm_hw_rule *rule)
 {
         unsigned int list[3];
         struct hdspm *hdspm = rule->private;
         struct snd_interval *c = hw_param_interval(params,
                         SNDRV_PCM_HW_PARAM_CHANNELS);
-        if (hdspm->is_aes32) {
-                list[0] = hdspm->qs_channels;
-                list[1] = hdspm->ds_channels;
-                list[2] = hdspm->ss_channels;
-                return snd_interval_list(c, 3, list, 0);
-        } else {
-                list[0] = hdspm->ds_channels;
-                list[1] = hdspm->ss_channels;
-                return snd_interval_list(c, 2, list, 0);
-        }
+
+        list[0] = hdspm->qs_in_channels;
+        list[1] = hdspm->ds_in_channels;
+        list[2] = hdspm->ss_in_channels;
+        return snd_interval_list(c, 3, list, 0);
+}
+
+static int snd_hdspm_hw_rule_out_channels(struct snd_pcm_hw_params *params,
+                                      struct snd_pcm_hw_rule *rule)
+{
+        unsigned int list[3];
+        struct hdspm *hdspm = rule->private;
+        struct snd_interval *c = hw_param_interval(params,
+                        SNDRV_PCM_HW_PARAM_CHANNELS);
+
+        list[0] = hdspm->qs_out_channels;
+        list[1] = hdspm->ds_out_channels;
+        list[2] = hdspm->ss_out_channels;
+        return snd_interval_list(c, 3, list, 0);
 }
 
 
@@ -3999,6 +5827,7 @@ static int snd_hdspm_playback_open(struct snd_pcm_substream *substream)
 
         snd_pcm_set_sync(substream);
 
+
         runtime->hw = snd_hdspm_playback_subinfo;
 
         if (hdspm->capture_substream == NULL)
@@ -4011,25 +5840,41 @@ static int snd_hdspm_playback_open(struct snd_pcm_substream *substream)
 
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
 
-        snd_pcm_hw_constraint_list(runtime, 0,
-                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                                   &hw_constraints_period_sizes);
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                &hw_constraints_period_sizes_new);
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                &hw_constraints_raydat_io_buffer);
 
-        if (hdspm->is_aes32) {
+                break;
+
+        default:
+                snd_pcm_hw_constraint_list(runtime, 0,
+                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                &hw_constraints_period_sizes_old);
+        }
+
+        if (AES32 == hdspm->io_type) {
                 snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                 &hdspm_hw_constraints_aes32_sample_rates);
         } else {
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                     snd_hdspm_hw_rule_channels, hdspm,
-                                     SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                    snd_hdspm_hw_rule_channels_rate, hdspm,
-                                    SNDRV_PCM_HW_PARAM_RATE, -1);
-
                 snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                    snd_hdspm_hw_rule_rate_channels, hdspm,
-                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                                snd_hdspm_hw_rule_rate_out_channels, hdspm,
+                                SNDRV_PCM_HW_PARAM_CHANNELS, -1);
         }
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_out_channels, hdspm,
+                        SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_out_channels_rate, hdspm,
+                        SNDRV_PCM_HW_PARAM_RATE, -1);
+
         return 0;
 }
 
@@ -4066,24 +5911,40 @@ static int snd_hdspm_capture_open(struct snd_pcm_substream *substream)
         spin_unlock_irq(&hdspm->lock);
 
         snd_pcm_hw_constraint_msbits(runtime, 0, 32, 24);
-        snd_pcm_hw_constraint_list(runtime, 0,
-                                   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                                   &hw_constraints_period_sizes);
-        if (hdspm->is_aes32) {
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                     &hw_constraints_period_sizes_new);
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                     &hw_constraints_raydat_io_buffer);
+          break;
+
+        default:
+          snd_pcm_hw_constraint_list(runtime, 0,
+                                     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                     &hw_constraints_period_sizes_old);
+        }
+
+        if (AES32 == hdspm->io_type) {
                 snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                 &hdspm_hw_constraints_aes32_sample_rates);
         } else {
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                     snd_hdspm_hw_rule_channels, hdspm,
-                                     SNDRV_PCM_HW_PARAM_CHANNELS, -1);
-                snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-                                    snd_hdspm_hw_rule_channels_rate, hdspm,
-                                    SNDRV_PCM_HW_PARAM_RATE, -1);
-
                 snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                                    snd_hdspm_hw_rule_rate_channels, hdspm,
-                                    SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+                                snd_hdspm_hw_rule_rate_in_channels, hdspm,
+                                SNDRV_PCM_HW_PARAM_CHANNELS, -1);
         }
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_in_channels, hdspm,
+                        SNDRV_PCM_HW_PARAM_CHANNELS, -1);
+
+        snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                        snd_hdspm_hw_rule_in_channels_rate, hdspm,
+                        SNDRV_PCM_HW_PARAM_RATE, -1);
+
         return 0;
 }
 
@@ -4100,32 +5961,129 @@ static int snd_hdspm_capture_release(struct snd_pcm_substream *substream)
         return 0;
 }
 
-static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
-                                 unsigned int cmd, unsigned long arg)
+static int snd_hdspm_hwdep_dummy_op(struct snd_hwdep *hw, struct file *file)
 {
+        /* we have nothing to initialize but the call is required */
+        return 0;
+}
+
+static inline int copy_u32_le(void __user *dest, void __iomem *src)
+{
+        u32 val = readl(src);
+        return copy_to_user(dest, &val, 4);
+}
+
+static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
+                unsigned int cmd, unsigned long __user arg)
+{
+        void __user *argp = (void __user *)arg;
         struct hdspm *hdspm = hw->private_data;
         struct hdspm_mixer_ioctl mixer;
-        struct hdspm_config_info info;
+        struct hdspm_config info;
+        struct hdspm_status status;
         struct hdspm_version hdspm_version;
-        struct hdspm_peak_rms_ioctl rms;
+        struct hdspm_peak_rms *levels;
+        struct hdspm_ltc ltc;
+        unsigned int statusregister;
+        long unsigned int s;
+        int i = 0;
 
         switch (cmd) {
 
         case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS:
-                if (copy_from_user(&rms, (void __user *)arg, sizeof(rms)))
+                levels = &hdspm->peak_rms;
+                for (i = 0; i < HDSPM_MAX_CHANNELS; i++) {
+                        levels->input_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_INPUT_PEAK + i*4);
+                        levels->playback_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_PLAYBACK_PEAK + i*4);
+                        levels->output_peaks[i] =
+                                readl(hdspm->iobase +
+                                                HDSPM_MADI_OUTPUT_PEAK + i*4);
+
+                        levels->input_rms[i] =
+                                ((uint64_t) readl(hdspm->iobase +
+                                        HDSPM_MADI_INPUT_RMS_H + i*4) << 32) |
+                                (uint64_t) readl(hdspm->iobase +
+                                                HDSPM_MADI_INPUT_RMS_L + i*4);
+                        levels->playback_rms[i] =
+                                ((uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_PLAYBACK_RMS_H+i*4) << 32) |
+                                (uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_PLAYBACK_RMS_L + i*4);
+                        levels->output_rms[i] =
+                                ((uint64_t)readl(hdspm->iobase +
+                                        HDSPM_MADI_OUTPUT_RMS_H + i*4) << 32) |
+                                (uint64_t)readl(hdspm->iobase +
+                                                HDSPM_MADI_OUTPUT_RMS_L + i*4);
+                }
+
+                if (hdspm->system_sample_rate > 96000) {
+                        levels->speed = qs;
+                } else if (hdspm->system_sample_rate > 48000) {
+                        levels->speed = ds;
+                } else {
+                        levels->speed = ss;
+                }
+                levels->status2 = hdspm_read(hdspm, HDSPM_statusRegister2);
+
+                s = copy_to_user(argp, levels, sizeof(struct hdspm_peak_rms));
+                if (0 != s) {
+                        /* snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu
+                         [Levels]\n", sizeof(struct hdspm_peak_rms), s);
+                         */
                         return -EFAULT;
-                /* maybe there is a chance to memorymap in future
-                 * so dont touch just copy
-                 */
-                if(copy_to_user_fromio((void __user *)rms.peak,
-                                       hdspm->iobase+HDSPM_MADI_peakrmsbase,
-                                       sizeof(struct hdspm_peak_rms)) != 0 )
+                }
+                break;
+
+        case SNDRV_HDSPM_IOCTL_GET_LTC:
+                ltc.ltc = hdspm_read(hdspm, HDSPM_RD_TCO);
+                i = hdspm_read(hdspm, HDSPM_RD_TCO + 4);
+                if (i & HDSPM_TCO1_LTC_Input_valid) {
+                        switch (i & (HDSPM_TCO1_LTC_Format_LSB |
+                                HDSPM_TCO1_LTC_Format_MSB)) {
+                        case 0:
+                                ltc.format = fps_24;
+                                break;
+                        case HDSPM_TCO1_LTC_Format_LSB:
+                                ltc.format = fps_25;
+                                break;
+                        case HDSPM_TCO1_LTC_Format_MSB:
+                                ltc.format = fps_2997;
+                                break;
+                        default:
+                                ltc.format = 30;
+                                break;
+                        }
+                        if (i & HDSPM_TCO1_set_drop_frame_flag) {
+                                ltc.frame = drop_frame;
+                        } else {
+                                ltc.frame = full_frame;
+                        }
+                } else {
+                        ltc.format = format_invalid;
+                        ltc.frame = frame_invalid;
+                }
+                if (i & HDSPM_TCO1_Video_Input_Format_NTSC) {
+                        ltc.input_format = ntsc;
+                } else if (i & HDSPM_TCO1_Video_Input_Format_PAL) {
+                        ltc.input_format = pal;
+                } else {
+                        ltc.input_format = no_video;
+                }
+
+                s = copy_to_user(argp, &ltc, sizeof(struct hdspm_ltc));
+                if (0 != s) {
+                        /*
+                         snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu [LTC]\n", sizeof(struct hdspm_ltc), s); */
                         return -EFAULT;
+                }
 
                 break;
-                
 
-        case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO:
+        case SNDRV_HDSPM_IOCTL_GET_CONFIG:
 
                 memset(&info, 0, sizeof(info));
                 spin_lock_irq(&hdspm->lock);
@@ -4134,7 +6092,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
 
                 info.system_sample_rate = hdspm->system_sample_rate;
                 info.autosync_sample_rate =
-                    hdspm_external_sample_rate(hdspm);
+                        hdspm_external_sample_rate(hdspm);
                 info.system_clock_mode = hdspm_system_clock_mode(hdspm);
                 info.clock_source = hdspm_clock_source(hdspm);
                 info.autosync_ref = hdspm_autosync_ref(hdspm);
@@ -4145,10 +6103,58 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                         return -EFAULT;
                 break;
 
+        case SNDRV_HDSPM_IOCTL_GET_STATUS:
+                status.card_type = hdspm->io_type;
+
+                status.autosync_source = hdspm_autosync_ref(hdspm);
+
+                status.card_clock = 110069313433624ULL;
+                status.master_period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+
+                switch (hdspm->io_type) {
+                case MADI:
+                case MADIface:
+                        status.card_specific.madi.sync_wc =
+                                hdspm_wc_sync_check(hdspm);
+                        status.card_specific.madi.sync_madi =
+                                hdspm_madi_sync_check(hdspm);
+                        status.card_specific.madi.sync_tco =
+                                hdspm_tco_sync_check(hdspm);
+                        status.card_specific.madi.sync_in =
+                                hdspm_sync_in_sync_check(hdspm);
+
+                        statusregister =
+                                hdspm_read(hdspm, HDSPM_statusRegister);
+                        status.card_specific.madi.madi_input =
+                                (statusregister & HDSPM_AB_int) ? 1 : 0;
+                        status.card_specific.madi.channel_format =
+                                (statusregister & HDSPM_TX_64ch) ? 1 : 0;
+                        /* TODO: Mac driver sets it when f_s>48kHz */
+                        status.card_specific.madi.frame_format = 0;
+
+                default:
+                        break;
+                }
+
+                if (copy_to_user((void __user *) arg, &status, sizeof(status)))
+                        return -EFAULT;
+
+
+                break;
+
         case SNDRV_HDSPM_IOCTL_GET_VERSION:
+                hdspm_version.card_type = hdspm->io_type;
+                strncpy(hdspm_version.cardname, hdspm->card_name,
+                                sizeof(hdspm_version.cardname));
+                hdspm_version.serial = (hdspm_read(hdspm,
+                                        HDSPM_midiStatusIn0)>>8) & 0xFFFFFF;
                 hdspm_version.firmware_rev = hdspm->firmware_rev;
+                hdspm_version.addons = 0;
+                if (hdspm->tco)
+                        hdspm_version.addons |= HDSPM_ADDON_TCO;
+
                 if (copy_to_user((void __user *) arg, &hdspm_version,
-                                 sizeof(hdspm_version)))
+                                        sizeof(hdspm_version)))
                         return -EFAULT;
                 break;
 
@@ -4156,7 +6162,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
                 if (copy_from_user(&mixer, (void __user *)arg, sizeof(mixer)))
                         return -EFAULT;
                 if (copy_to_user((void __user *)mixer.mixer, hdspm->mixer,
-                                 sizeof(struct hdspm_mixer)))
+                                        sizeof(struct hdspm_mixer)))
                         return -EFAULT;
                 break;
 
@@ -4175,8 +6181,6 @@ static struct snd_pcm_ops snd_hdspm_playback_ops = {
         .prepare = snd_hdspm_prepare,
         .trigger = snd_hdspm_trigger,
         .pointer = snd_hdspm_hw_pointer,
-        .copy = snd_hdspm_playback_copy,
-        .silence = snd_hdspm_hw_silence,
         .page = snd_pcm_sgbuf_ops_page,
 };
 
@@ -4189,7 +6193,6 @@ static struct snd_pcm_ops snd_hdspm_capture_ops = {
         .prepare = snd_hdspm_prepare,
         .trigger = snd_hdspm_trigger,
         .pointer = snd_hdspm_hw_pointer,
-        .copy = snd_hdspm_capture_copy,
         .page = snd_pcm_sgbuf_ops_page,
 };
 
@@ -4207,16 +6210,18 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card,
         hw->private_data = hdspm;
         strcpy(hw->name, "HDSPM hwdep interface");
 
+        hw->ops.open = snd_hdspm_hwdep_dummy_op;
         hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
+        hw->ops.release = snd_hdspm_hwdep_dummy_op;
 
         return 0;
 }
 
 
 /*------------------------------------------------------------
-   memory interface 
+   memory interface
  ------------------------------------------------------------*/
-static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
+static int __devinit snd_hdspm_preallocate_memory(struct hdspm *hdspm)
 {
         int err;
         struct snd_pcm *pcm;
@@ -4228,7 +6233,7 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
 
         err =
              snd_pcm_lib_preallocate_pages_for_all(pcm,
-                                                   SNDRV_DMA_TYPE_DEV_SG,
+                                                   SNDRV_DMA_TYPE_DEV_SG,
                                                    snd_dma_pci_data(hdspm->pci),
                                                    wanted,
                                                    wanted);
@@ -4242,19 +6247,23 @@ static int __devinit snd_hdspm_preallocate_memory(struct hdspm * hdspm)
         return 0;
 }
 
-static void hdspm_set_sgbuf(struct hdspm * hdspm,
+
+static void hdspm_set_sgbuf(struct hdspm *hdspm,
                             struct snd_pcm_substream *substream,
                              unsigned int reg, int channels)
 {
         int i;
+
+        /* continuous memory segment */
         for (i = 0; i < (channels * 16); i++)
                 hdspm_write(hdspm, reg + 4 * i,
-                            snd_pcm_sgbuf_get_addr(substream, 4096 * i));
+                                snd_pcm_sgbuf_get_addr(substream, 4096 * i));
 }
 
+
 /* ------------- ALSA Devices ---------------------------- */
 static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
-                                          struct hdspm * hdspm)
+                                          struct hdspm *hdspm)
 {
         struct snd_pcm *pcm;
         int err;
@@ -4283,27 +6292,30 @@ static int __devinit snd_hdspm_create_pcm(struct snd_card *card,
 
 static inline void snd_hdspm_initialize_midi_flush(struct hdspm * hdspm)
 {
-        snd_hdspm_flush_midi_input(hdspm, 0);
-        snd_hdspm_flush_midi_input(hdspm, 1);
+        int i;
+
+        for (i = 0; i < hdspm->midiPorts; i++)
+                snd_hdspm_flush_midi_input(hdspm, i);
 }
 
 static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
                                                    struct hdspm * hdspm)
 {
-        int err;
+        int err, i;
 
         snd_printdd("Create card...\n");
         err = snd_hdspm_create_pcm(card, hdspm);
         if (err < 0)
                 return err;
 
-        err = snd_hdspm_create_midi(card, hdspm, 0);
-        if (err < 0)
-                return err;
-
-        err = snd_hdspm_create_midi(card, hdspm, 1);
-        if (err < 0)
-                return err;
+        i = 0;
+        while (i < hdspm->midiPorts) {
+                err = snd_hdspm_create_midi(card, hdspm, i);
+                if (err < 0) {
+                        return err;
+                }
+                i++;
+        }
 
         err = snd_hdspm_create_controls(card, hdspm);
         if (err < 0)
@@ -4346,37 +6358,55 @@ static int __devinit snd_hdspm_create_alsa_devices(struct snd_card *card,
 }
 
 static int __devinit snd_hdspm_create(struct snd_card *card,
-                                      struct hdspm *hdspm,
-                                      int precise_ptr, int enable_monitor)
-{
+                struct hdspm *hdspm) {
+
         struct pci_dev *pci = hdspm->pci;
         int err;
         unsigned long io_extent;
 
         hdspm->irq = -1;
-
-        spin_lock_init(&hdspm->midi[0].lock);
-        spin_lock_init(&hdspm->midi[1].lock);
-
         hdspm->card = card;
 
         spin_lock_init(&hdspm->lock);
 
-        tasklet_init(&hdspm->midi_tasklet,
-                     hdspm_midi_tasklet, (unsigned long) hdspm);
-
         pci_read_config_word(hdspm->pci,
-                             PCI_CLASS_REVISION, &hdspm->firmware_rev);
-
-        hdspm->is_aes32 = (hdspm->firmware_rev >= HDSPM_AESREVISION);
+                        PCI_CLASS_REVISION, &hdspm->firmware_rev);
 
         strcpy(card->mixername, "Xilinx FPGA");
-        if (hdspm->is_aes32) {
-                strcpy(card->driver, "HDSPAES32");
-                hdspm->card_name = "RME HDSPM AES32";
-        } else {
-                strcpy(card->driver, "HDSPM");
-                hdspm->card_name = "RME HDSPM MADI";
+        strcpy(card->driver, "HDSPM");
+
+        switch (hdspm->firmware_rev) {
+        case HDSPM_MADI_REV:
+                hdspm->io_type = MADI;
+                hdspm->card_name = "RME MADI";
+                hdspm->midiPorts = 3;
+                break;
+        case HDSPM_RAYDAT_REV:
+                hdspm->io_type = RayDAT;
+                hdspm->card_name = "RME RayDAT";
+                hdspm->midiPorts = 2;
+                break;
+        case HDSPM_AIO_REV:
+                hdspm->io_type = AIO;
+                hdspm->card_name = "RME AIO";
+                hdspm->midiPorts = 1;
+                break;
+        case HDSPM_MADIFACE_REV:
+                hdspm->io_type = MADIface;
+                hdspm->card_name = "RME MADIface";
+                hdspm->midiPorts = 1;
+                break;
+        case HDSPM_AES_REV:
+        case HDSPM_AES32_REV:
+        case HDSPM_AES32_OLD_REV:
+                hdspm->io_type = AES32;
+                hdspm->card_name = "RME AES32";
+                hdspm->midiPorts = 2;
+                break;
+        default:
+                snd_printk(KERN_ERR "HDSPM: unknown firmware revision %x\n",
+                                hdspm->firmware_rev);
+                return -ENODEV;
         }
 
         err = pci_enable_device(pci);
@@ -4393,22 +6423,21 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         io_extent = pci_resource_len(pci, 0);
 
         snd_printdd("grabbed memory region 0x%lx-0x%lx\n",
-                   hdspm->port, hdspm->port + io_extent - 1);
-
+                        hdspm->port, hdspm->port + io_extent - 1);
 
         hdspm->iobase = ioremap_nocache(hdspm->port, io_extent);
         if (!hdspm->iobase) {
                 snd_printk(KERN_ERR "HDSPM: "
-                           "unable to remap region 0x%lx-0x%lx\n",
-                           hdspm->port, hdspm->port + io_extent - 1);
+                                "unable to remap region 0x%lx-0x%lx\n",
+                                hdspm->port, hdspm->port + io_extent - 1);
                 return -EBUSY;
         }
         snd_printdd("remapped region (0x%lx) 0x%lx-0x%lx\n",
-                   (unsigned long)hdspm->iobase, hdspm->port,
-                   hdspm->port + io_extent - 1);
+                        (unsigned long)hdspm->iobase, hdspm->port,
+                        hdspm->port + io_extent - 1);
 
         if (request_irq(pci->irq, snd_hdspm_interrupt,
-                        IRQF_SHARED, "hdspm", hdspm)) {
+                                IRQF_SHARED, "hdspm", hdspm)) {
                 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
@@ -4416,23 +6445,219 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         snd_printdd("use IRQ %d\n", pci->irq);
 
         hdspm->irq = pci->irq;
-        hdspm->precise_ptr = precise_ptr;
-
-        hdspm->monitor_outs = enable_monitor;
 
         snd_printdd("kmalloc Mixer memory of %zd Bytes\n",
-                   sizeof(struct hdspm_mixer));
+                        sizeof(struct hdspm_mixer));
         hdspm->mixer = kzalloc(sizeof(struct hdspm_mixer), GFP_KERNEL);
         if (!hdspm->mixer) {
                 snd_printk(KERN_ERR "HDSPM: "
-                           "unable to kmalloc Mixer memory of %d Bytes\n",
-                           (int)sizeof(struct hdspm_mixer));
+                                "unable to kmalloc Mixer memory of %d Bytes\n",
+                                (int)sizeof(struct hdspm_mixer));
                 return err;
         }
 
-        hdspm->ss_channels = MADI_SS_CHANNELS;
-        hdspm->ds_channels = MADI_DS_CHANNELS;
-        hdspm->qs_channels = MADI_QS_CHANNELS;
+        hdspm->port_names_in = NULL;
+        hdspm->port_names_out = NULL;
+
+        switch (hdspm->io_type) {
+        case AES32:
+                hdspm->ss_in_channels = hdspm->ss_out_channels = AES32_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels = AES32_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels = AES32_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_aes32;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_aes32;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_aes32;
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_aes32;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_aes32;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_aes32;
+
+                hdspm->max_channels_out = hdspm->max_channels_in =
+                        AES32_CHANNELS;
+                hdspm->port_names_in = hdspm->port_names_out =
+                        texts_ports_aes32;
+                hdspm->channel_map_in = hdspm->channel_map_out =
+                        channel_map_aes32;
+
+                break;
+
+        case MADI:
+        case MADIface:
+                hdspm->ss_in_channels = hdspm->ss_out_channels =
+                        MADI_SS_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels =
+                        MADI_DS_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels =
+                        MADI_QS_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_unity_ss;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_unity_ss;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_unity_ss;
+
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_madi;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_madi;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_madi;
+                break;
+
+        case AIO:
+                if (0 == (hdspm_read(hdspm, HDSPM_statusRegister2) & HDSPM_s2_AEBI_D)) {
+                        snd_printk(KERN_INFO "HDSPM: AEB input board found, but not supported\n");
+                }
+
+                hdspm->ss_in_channels = AIO_IN_SS_CHANNELS;
+                hdspm->ds_in_channels = AIO_IN_DS_CHANNELS;
+                hdspm->qs_in_channels = AIO_IN_QS_CHANNELS;
+                hdspm->ss_out_channels = AIO_OUT_SS_CHANNELS;
+                hdspm->ds_out_channels = AIO_OUT_DS_CHANNELS;
+                hdspm->qs_out_channels = AIO_OUT_QS_CHANNELS;
+
+                hdspm->channel_map_out_ss = channel_map_aio_out_ss;
+                hdspm->channel_map_out_ds = channel_map_aio_out_ds;
+                hdspm->channel_map_out_qs = channel_map_aio_out_qs;
+
+                hdspm->channel_map_in_ss = channel_map_aio_in_ss;
+                hdspm->channel_map_in_ds = channel_map_aio_in_ds;
+                hdspm->channel_map_in_qs = channel_map_aio_in_qs;
+
+                hdspm->port_names_in_ss = texts_ports_aio_in_ss;
+                hdspm->port_names_out_ss = texts_ports_aio_out_ss;
+                hdspm->port_names_in_ds = texts_ports_aio_in_ds;
+                hdspm->port_names_out_ds = texts_ports_aio_out_ds;
+                hdspm->port_names_in_qs = texts_ports_aio_in_qs;
+                hdspm->port_names_out_qs = texts_ports_aio_out_qs;
+
+                break;
+
+        case RayDAT:
+                hdspm->ss_in_channels = hdspm->ss_out_channels =
+                        RAYDAT_SS_CHANNELS;
+                hdspm->ds_in_channels = hdspm->ds_out_channels =
+                        RAYDAT_DS_CHANNELS;
+                hdspm->qs_in_channels = hdspm->qs_out_channels =
+                        RAYDAT_QS_CHANNELS;
+
+                hdspm->max_channels_in = RAYDAT_SS_CHANNELS;
+                hdspm->max_channels_out = RAYDAT_SS_CHANNELS;
+
+                hdspm->channel_map_in_ss = hdspm->channel_map_out_ss =
+                        channel_map_raydat_ss;
+                hdspm->channel_map_in_ds = hdspm->channel_map_out_ds =
+                        channel_map_raydat_ds;
+                hdspm->channel_map_in_qs = hdspm->channel_map_out_qs =
+                        channel_map_raydat_qs;
+                hdspm->channel_map_in = hdspm->channel_map_out =
+                        channel_map_raydat_ss;
+
+                hdspm->port_names_in_ss = hdspm->port_names_out_ss =
+                        texts_ports_raydat_ss;
+                hdspm->port_names_in_ds = hdspm->port_names_out_ds =
+                        texts_ports_raydat_ds;
+                hdspm->port_names_in_qs = hdspm->port_names_out_qs =
+                        texts_ports_raydat_qs;
+
+
+                break;
+
+        }
+
+        /* TCO detection */
+        switch (hdspm->io_type) {
+        case AIO:
+        case RayDAT:
+                if (hdspm_read(hdspm, HDSPM_statusRegister2) &
+                                HDSPM_s2_tco_detect) {
+                        hdspm->midiPorts++;
+                        hdspm->tco = kzalloc(sizeof(struct hdspm_tco),
+                                        GFP_KERNEL);
+                        if (NULL != hdspm->tco) {
+                                hdspm_tco_write(hdspm);
+                        }
+                        snd_printk(KERN_INFO "HDSPM: AIO/RayDAT TCO module found\n");
+                } else {
+                        hdspm->tco = NULL;
+                }
+                break;
+
+        case MADI:
+                if (hdspm_read(hdspm, HDSPM_statusRegister) & HDSPM_tco_detect) {
+                        hdspm->midiPorts++;
+                        hdspm->tco = kzalloc(sizeof(struct hdspm_tco),
+                                        GFP_KERNEL);
+                        if (NULL != hdspm->tco) {
+                                hdspm_tco_write(hdspm);
+                        }
+                        snd_printk(KERN_INFO "HDSPM: MADI TCO module found\n");
+                } else {
+                        hdspm->tco = NULL;
+                }
+                break;
+
+        default:
+                hdspm->tco = NULL;
+        }
+
+        /* texts */
+        switch (hdspm->io_type) {
+        case AES32:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_aes_tco;
+                        hdspm->texts_autosync_items = 10;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_aes;
+                        hdspm->texts_autosync_items = 9;
+                }
+                break;
+
+        case MADI:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_madi_tco;
+                        hdspm->texts_autosync_items = 4;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_madi;
+                        hdspm->texts_autosync_items = 3;
+                }
+                break;
+
+        case MADIface:
+
+                break;
+
+        case RayDAT:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_raydat_tco;
+                        hdspm->texts_autosync_items = 9;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_raydat;
+                        hdspm->texts_autosync_items = 8;
+                }
+                break;
+
+        case AIO:
+                if (hdspm->tco) {
+                        hdspm->texts_autosync = texts_autosync_aio_tco;
+                        hdspm->texts_autosync_items = 6;
+                } else {
+                        hdspm->texts_autosync = texts_autosync_aio;
+                        hdspm->texts_autosync_items = 5;
+                }
+                break;
+
+        }
+
+        tasklet_init(&hdspm->midi_tasklet,
+                        hdspm_midi_tasklet, (unsigned long) hdspm);
 
         snd_printdd("create alsa devices.\n");
         err = snd_hdspm_create_alsa_devices(card, hdspm);
@@ -4444,6 +6669,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
         return 0;
 }
 
+
 static int snd_hdspm_free(struct hdspm * hdspm)
 {
 
@@ -4452,7 +6678,8 @@ static int snd_hdspm_free(struct hdspm * hdspm)
                 /* stop th audio, and cancel all interrupts */
                 hdspm->control_register &=
                     ~(HDSPM_Start | HDSPM_AudioInterruptEnable |
-                      HDSPM_Midi0InterruptEnable | HDSPM_Midi1InterruptEnable);
+                      HDSPM_Midi0InterruptEnable | HDSPM_Midi1InterruptEnable |
+                      HDSPM_Midi2InterruptEnable | HDSPM_Midi3InterruptEnable);
                 hdspm_write(hdspm, HDSPM_controlRegister,
                             hdspm->control_register);
         }
@@ -4472,6 +6699,7 @@ static int snd_hdspm_free(struct hdspm * hdspm)
         return 0;
 }
 
+
 static void snd_hdspm_card_free(struct snd_card *card)
 {
         struct hdspm *hdspm = card->private_data;
@@ -4480,6 +6708,7 @@ static void snd_hdspm_card_free(struct snd_card *card)
                 snd_hdspm_free(hdspm);
 }
 
+
 static int __devinit snd_hdspm_probe(struct pci_dev *pci,
                                      const struct pci_device_id *pci_id)
 {
@@ -4496,7 +6725,7 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
         }
 
         err = snd_card_create(index[dev], id[dev],
-                              THIS_MODULE, sizeof(struct hdspm), &card);
+                        THIS_MODULE, sizeof(struct hdspm), &card);
         if (err < 0)
                 return err;
 
@@ -4507,16 +6736,25 @@ static int __devinit snd_hdspm_probe(struct pci_dev *pci,
 
         snd_card_set_dev(card, &pci->dev);
 
-        err = snd_hdspm_create(card, hdspm, precise_ptr[dev],
-                               enable_monitor[dev]);
+        err = snd_hdspm_create(card, hdspm);
         if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
-        strcpy(card->shortname, "HDSPM MADI");
-        sprintf(card->longname, "%s at 0x%lx, irq %d", hdspm->card_name,
-                hdspm->port, hdspm->irq);
+        if (hdspm->io_type != MADIface) {
+                sprintf(card->shortname, "%s_%x",
+                        hdspm->card_name,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF);
+                sprintf(card->longname, "%s S/N 0x%x at 0x%lx, irq %d",
+                        hdspm->card_name,
+                        (hdspm_read(hdspm, HDSPM_midiStatusIn0)>>8) & 0xFFFFFF,
+                        hdspm->port, hdspm->irq);
+        } else {
+                sprintf(card->shortname, "%s", hdspm->card_name);
+                sprintf(card->longname, "%s at 0x%lx, irq %d",
+                                hdspm->card_name, hdspm->port, hdspm->irq);
+        }
 
         err = snd_card_register(card);
         if (err < 0) {
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index b47cfd45b3b9..3ecbd67f88c9 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1034,7 +1034,11 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip)
         if (of_device_is_compatible(sound, "tumbler")) {
                 chip->model = PMAC_TUMBLER;
                 chip->can_capture = of_machine_is_compatible("PowerMac4,2")
-                                || of_machine_is_compatible("PowerBook4,1");
+                                || of_machine_is_compatible("PowerBook3,2")
+                                || of_machine_is_compatible("PowerBook3,3")
+                                || of_machine_is_compatible("PowerBook4,1")
+                                || of_machine_is_compatible("PowerBook4,2")
+                                || of_machine_is_compatible("PowerBook4,3");
                 chip->can_duplex = 0;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
                 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 5580aced8730..6ce277860fd7 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -384,6 +384,9 @@ int register_sound_special_device(const struct file_operations *fops, int unit,
             case 4:
                 name = "audio";
                 break;
+            case 5:
+                name = "dspW";
+                break;
             case 8:
                 name = "sequencer2";
                 if (unit >= SOUND_STEP)
diff --git a/sound/usb/6fire/Makefile b/sound/usb/6fire/Makefile
new file mode 100644
index 000000000000..dfce6ec53513
--- /dev/null
+++ b/sound/usb/6fire/Makefile
@@ -0,0 +1,3 @@
+snd-usb-6fire-objs += chip.o comm.o midi.o control.o firmware.o pcm.o
+obj-$(CONFIG_SND_USB_6FIRE) += snd-usb-6fire.o
+
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c
new file mode 100644
index 000000000000..c7dca7b0b9fe
--- /dev/null
+++ b/sound/usb/6fire/chip.c
@@ -0,0 +1,232 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Main routines and module definitions.
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include "chip.h"
+#include "firmware.h"
+#include "pcm.h"
+#include "control.h"
+#include "comm.h"
+#include "midi.h"
+
+#include <linux/moduleparam.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/gfp.h>
+#include <sound/initval.h>
+
+MODULE_AUTHOR("Torsten Schenk <torsten.schenk@zoho.com>");
+MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver, version 0.3.0");
+MODULE_LICENSE("GPL v2");
+MODULE_SUPPORTED_DEVICE("{{TerraTec, DMX 6Fire USB}}");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable card */
+static struct sfire_chip *chips[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+static struct usb_device *devices[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for the 6fire sound device");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for the 6fire sound device.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable the 6fire sound device.");
+
+static DEFINE_MUTEX(register_mutex);
+
+static void usb6fire_chip_abort(struct sfire_chip *chip)
+{
+        if (chip) {
+                if (chip->pcm)
+                        usb6fire_pcm_abort(chip);
+                if (chip->midi)
+                        usb6fire_midi_abort(chip);
+                if (chip->comm)
+                        usb6fire_comm_abort(chip);
+                if (chip->control)
+                        usb6fire_control_abort(chip);
+                if (chip->card) {
+                        snd_card_disconnect(chip->card);
+                        snd_card_free_when_closed(chip->card);
+                        chip->card = NULL;
+                }
+        }
+}
+
+static void usb6fire_chip_destroy(struct sfire_chip *chip)
+{
+        if (chip) {
+                if (chip->pcm)
+                        usb6fire_pcm_destroy(chip);
+                if (chip->midi)
+                        usb6fire_midi_destroy(chip);
+                if (chip->comm)
+                        usb6fire_comm_destroy(chip);
+                if (chip->control)
+                        usb6fire_control_destroy(chip);
+                if (chip->card)
+                        snd_card_free(chip->card);
+        }
+}
+
+static int __devinit usb6fire_chip_probe(struct usb_interface *intf,
+                const struct usb_device_id *usb_id)
+{
+        int ret;
+        int i;
+        struct sfire_chip *chip = NULL;
+        struct usb_device *device = interface_to_usbdev(intf);
+        int regidx = -1; /* index in module parameter array */
+        struct snd_card *card = NULL;
+
+        /* look if we already serve this card and return if so */
+        mutex_lock(&register_mutex);
+        for (i = 0; i < SNDRV_CARDS; i++) {
+                if (devices[i] == device) {
+                        if (chips[i])
+                                chips[i]->intf_count++;
+                        usb_set_intfdata(intf, chips[i]);
+                        mutex_unlock(&register_mutex);
+                        return 0;
+                } else if (regidx < 0)
+                        regidx = i;
+        }
+        if (regidx < 0) {
+                mutex_unlock(&register_mutex);
+                snd_printk(KERN_ERR PREFIX "too many cards registered.\n");
+                return -ENODEV;
+        }
+        devices[regidx] = device;
+        mutex_unlock(&register_mutex);
+
+        /* check, if firmware is present on device, upload it if not */
+        ret = usb6fire_fw_init(intf);
+        if (ret < 0)
+                return ret;
+        else if (ret == FW_NOT_READY) /* firmware update performed */
+                return 0;
+
+        /* if we are here, card can be registered in alsa. */
+        if (usb_set_interface(device, 0, 0) != 0) {
+                snd_printk(KERN_ERR PREFIX "can't set first interface.\n");
+                return -EIO;
+        }
+        ret = snd_card_create(index[regidx], id[regidx], THIS_MODULE,
+                        sizeof(struct sfire_chip), &card);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "cannot create alsa card.\n");
+                return ret;
+        }
+        strcpy(card->driver, "6FireUSB");
+        strcpy(card->shortname, "TerraTec DMX6FireUSB");
+        sprintf(card->longname, "%s at %d:%d", card->shortname,
+                        device->bus->busnum, device->devnum);
+        snd_card_set_dev(card, &intf->dev);
+
+        chip = card->private_data;
+        chips[regidx] = chip;
+        chip->dev = device;
+        chip->regidx = regidx;
+        chip->intf_count = 1;
+        chip->card = card;
+
+        ret = usb6fire_comm_init(chip);
+        if (ret < 0) {
+                usb6fire_chip_destroy(chip);
+                return ret;
+        }
+
+        ret = usb6fire_midi_init(chip);
+        if (ret < 0) {
+                usb6fire_chip_destroy(chip);
+                return ret;
+        }
+
+        ret = usb6fire_pcm_init(chip);
+        if (ret < 0) {
+                usb6fire_chip_destroy(chip);
+                return ret;
+        }
+
+        ret = usb6fire_control_init(chip);
+        if (ret < 0) {
+                usb6fire_chip_destroy(chip);
+                return ret;
+        }
+
+        ret = snd_card_register(card);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "cannot register card.");
+                usb6fire_chip_destroy(chip);
+                return ret;
+        }
+        usb_set_intfdata(intf, chip);
+        return 0;
+}
+
+static void usb6fire_chip_disconnect(struct usb_interface *intf)
+{
+        struct sfire_chip *chip;
+        struct snd_card *card;
+
+        chip = usb_get_intfdata(intf);
+        if (chip) { /* if !chip, fw upload has been performed */
+                card = chip->card;
+                chip->intf_count--;
+                if (!chip->intf_count) {
+                        mutex_lock(&register_mutex);
+                        devices[chip->regidx] = NULL;
+                        chips[chip->regidx] = NULL;
+                        mutex_unlock(&register_mutex);
+
+                        chip->shutdown = true;
+                        usb6fire_chip_abort(chip);
+                        usb6fire_chip_destroy(chip);
+                }
+        }
+}
+
+static struct usb_device_id device_table[] = {
+        {
+                .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+                .idVendor = 0x0ccd,
+                .idProduct = 0x0080
+        },
+        {}
+};
+
+MODULE_DEVICE_TABLE(usb, device_table);
+
+static struct usb_driver driver = {
+        .name = "snd-usb-6fire",
+        .probe = usb6fire_chip_probe,
+        .disconnect = usb6fire_chip_disconnect,
+        .id_table = device_table,
+};
+
+static int __init usb6fire_chip_init(void)
+{
+        return usb_register(&driver);
+}
+
+static void __exit usb6fire_chip_cleanup(void)
+{
+        usb_deregister(&driver);
+}
+
+module_init(usb6fire_chip_init);
+module_exit(usb6fire_chip_cleanup);
diff --git a/sound/usb/6fire/chip.h b/sound/usb/6fire/chip.h
new file mode 100644
index 000000000000..d11e5cb520f0
--- /dev/null
+++ b/sound/usb/6fire/chip.h
@@ -0,0 +1,32 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef USB6FIRE_CHIP_H
+#define USB6FIRE_CHIP_H
+
+#include "common.h"
+
+struct sfire_chip {
+        struct usb_device *dev;
+        struct snd_card *card;
+        int intf_count; /* number of registered interfaces */
+        int regidx; /* index in module parameter arrays */
+        bool shutdown;
+
+        struct midi_runtime *midi;
+        struct pcm_runtime *pcm;
+        struct control_runtime *control;
+        struct comm_runtime *comm;
+};
+#endif /* USB6FIRE_CHIP_H */
+
diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
new file mode 100644
index 000000000000..c994daa57af2
--- /dev/null
+++ b/sound/usb/6fire/comm.c
@@ -0,0 +1,176 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Device communications
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include "comm.h"
+#include "chip.h"
+#include "midi.h"
+
+enum {
+        COMM_EP = 1,
+        COMM_FPGA_EP = 2
+};
+
+static void usb6fire_comm_init_urb(struct comm_runtime *rt, struct urb *urb,
+                u8 *buffer, void *context, void(*handler)(struct urb *urb))
+{
+        usb_init_urb(urb);
+        urb->transfer_buffer = buffer;
+        urb->pipe = usb_sndintpipe(rt->chip->dev, COMM_EP);
+        urb->complete = handler;
+        urb->context = context;
+        urb->interval = 1;
+        urb->dev = rt->chip->dev;
+}
+
+static void usb6fire_comm_receiver_handler(struct urb *urb)
+{
+        struct comm_runtime *rt = urb->context;
+        struct midi_runtime *midi_rt = rt->chip->midi;
+
+        if (!urb->status) {
+                if (rt->receiver_buffer[0] == 0x10) /* midi in event */
+                        if (midi_rt)
+                                midi_rt->in_received(midi_rt,
+                                                rt->receiver_buffer + 2,
+                                                rt->receiver_buffer[1]);
+        }
+
+        if (!rt->chip->shutdown) {
+                urb->status = 0;
+                urb->actual_length = 0;
+                if (usb_submit_urb(urb, GFP_ATOMIC) < 0)
+                        snd_printk(KERN_WARNING PREFIX
+                                        "comm data receiver aborted.\n");
+        }
+}
+
+static void usb6fire_comm_init_buffer(u8 *buffer, u8 id, u8 request,
+                u8 reg, u8 vl, u8 vh)
+{
+        buffer[0] = 0x01;
+        buffer[2] = request;
+        buffer[3] = id;
+        switch (request) {
+        case 0x02:
+                buffer[1] = 0x05; /* length (starting at buffer[2]) */
+                buffer[4] = reg;
+                buffer[5] = vl;
+                buffer[6] = vh;
+                break;
+
+        case 0x12:
+                buffer[1] = 0x0b; /* length (starting at buffer[2]) */
+                buffer[4] = 0x00;
+                buffer[5] = 0x18;
+                buffer[6] = 0x05;
+                buffer[7] = 0x00;
+                buffer[8] = 0x01;
+                buffer[9] = 0x00;
+                buffer[10] = 0x9e;
+                buffer[11] = reg;
+                buffer[12] = vl;
+                break;
+
+        case 0x20:
+        case 0x21:
+        case 0x22:
+                buffer[1] = 0x04;
+                buffer[4] = reg;
+                buffer[5] = vl;
+                break;
+        }
+}
+
+static int usb6fire_comm_send_buffer(u8 *buffer, struct usb_device *dev)
+{
+        int ret;
+        int actual_len;
+
+        ret = usb_interrupt_msg(dev, usb_sndintpipe(dev, COMM_EP),
+                        buffer, buffer[1] + 2, &actual_len, HZ);
+        if (ret < 0)
+                return ret;
+        else if (actual_len != buffer[1] + 2)
+                return -EIO;
+        return 0;
+}
+
+static int usb6fire_comm_write8(struct comm_runtime *rt, u8 request,
+                u8 reg, u8 value)
+{
+        u8 buffer[13]; /* 13: maximum length of message */
+
+        usb6fire_comm_init_buffer(buffer, 0x00, request, reg, value, 0x00);
+        return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
+}
+
+static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
+                u8 reg, u8 vl, u8 vh)
+{
+        u8 buffer[13]; /* 13: maximum length of message */
+
+        usb6fire_comm_init_buffer(buffer, 0x00, request, reg, vl, vh);
+        return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
+}
+
+int __devinit usb6fire_comm_init(struct sfire_chip *chip)
+{
+        struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime),
+                        GFP_KERNEL);
+        struct urb *urb = &rt->receiver;
+        int ret;
+
+        if (!rt)
+                return -ENOMEM;
+
+        rt->serial = 1;
+        rt->chip = chip;
+        usb_init_urb(urb);
+        rt->init_urb = usb6fire_comm_init_urb;
+        rt->write8 = usb6fire_comm_write8;
+        rt->write16 = usb6fire_comm_write16;
+
+        /* submit an urb that receives communication data from device */
+        urb->transfer_buffer = rt->receiver_buffer;
+        urb->transfer_buffer_length = COMM_RECEIVER_BUFSIZE;
+        urb->pipe = usb_rcvintpipe(chip->dev, COMM_EP);
+        urb->dev = chip->dev;
+        urb->complete = usb6fire_comm_receiver_handler;
+        urb->context = rt;
+        urb->interval = 1;
+        ret = usb_submit_urb(urb, GFP_KERNEL);
+        if (ret < 0) {
+                kfree(rt);
+                snd_printk(KERN_ERR PREFIX "cannot create comm data receiver.");
+                return ret;
+        }
+        chip->comm = rt;
+        return 0;
+}
+
+void usb6fire_comm_abort(struct sfire_chip *chip)
+{
+        struct comm_runtime *rt = chip->comm;
+
+        if (rt)
+                usb_poison_urb(&rt->receiver);
+}
+
+void usb6fire_comm_destroy(struct sfire_chip *chip)
+{
+        kfree(chip->comm);
+        chip->comm = NULL;
+}
diff --git a/sound/usb/6fire/comm.h b/sound/usb/6fire/comm.h
new file mode 100644
index 000000000000..edc5dc84b888
--- /dev/null
+++ b/sound/usb/6fire/comm.h
@@ -0,0 +1,44 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+#ifndef USB6FIRE_COMM_H
+#define USB6FIRE_COMM_H
+
+#include "common.h"
+
+enum /* settings for comm */
+{
+        COMM_RECEIVER_BUFSIZE = 64,
+};
+
+struct comm_runtime {
+        struct sfire_chip *chip;
+
+        struct urb receiver;
+        u8 receiver_buffer[COMM_RECEIVER_BUFSIZE];
+
+        u8 serial; /* urb serial */
+
+        void (*init_urb)(struct comm_runtime *rt, struct urb *urb, u8 *buffer,
+                        void *context, void(*handler)(struct urb *urb));
+        /* writes control data to the device */
+        int (*write8)(struct comm_runtime *rt, u8 request, u8 reg, u8 value);
+        int (*write16)(struct comm_runtime *rt, u8 request, u8 reg,
+                        u8 vh, u8 vl);
+};
+
+int __devinit usb6fire_comm_init(struct sfire_chip *chip);
+void usb6fire_comm_abort(struct sfire_chip *chip);
+void usb6fire_comm_destroy(struct sfire_chip *chip);
+#endif /* USB6FIRE_COMM_H */
+
diff --git a/sound/usb/6fire/common.h b/sound/usb/6fire/common.h
new file mode 100644
index 000000000000..7dbeb4a37831
--- /dev/null
+++ b/sound/usb/6fire/common.h
@@ -0,0 +1,30 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_COMMON_H
+#define USB6FIRE_COMMON_H
+
+#include <linux/slab.h>
+#include <linux/usb.h>
+#include <sound/core.h>
+
+#define PREFIX "6fire: "
+
+struct sfire_chip;
+struct midi_runtime;
+struct pcm_runtime;
+struct control_runtime;
+struct comm_runtime;
+#endif /* USB6FIRE_COMMON_H */
+
diff --git a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c
new file mode 100644
index 000000000000..248463511186
--- /dev/null
+++ b/sound/usb/6fire/control.c
@@ -0,0 +1,275 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Mixer control
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/interrupt.h>
+#include <sound/control.h>
+
+#include "control.h"
+#include "comm.h"
+#include "chip.h"
+
+static char *opt_coax_texts[2] = { "Optical", "Coax" };
+static char *line_phono_texts[2] = { "Line", "Phono" };
+
+/*
+ * calculated with $value\[i\] = 128 \cdot sqrt[3]{\frac{i}{128}}$
+ * this is done because the linear values cause rapid degredation
+ * of volume in the uppermost region.
+ */
+static const u8 log_volume_table[128] = {
+        0x00, 0x19, 0x20, 0x24, 0x28, 0x2b, 0x2e, 0x30, 0x32, 0x34,
+        0x36, 0x38, 0x3a, 0x3b, 0x3d, 0x3e, 0x40, 0x41, 0x42, 0x43,
+        0x44, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e,
+        0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x53, 0x54, 0x55, 0x56,
+        0x56, 0x57, 0x58, 0x58, 0x59, 0x5a, 0x5b, 0x5b, 0x5c, 0x5c,
+        0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x60, 0x61, 0x61, 0x62, 0x62,
+        0x63, 0x63, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0x67, 0x68,
+        0x68, 0x69, 0x69, 0x6a, 0x6a, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c,
+        0x6d, 0x6d, 0x6e, 0x6e, 0x6f, 0x6f, 0x70, 0x70, 0x70, 0x71,
+        0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x74, 0x75, 0x75,
+        0x75, 0x76, 0x76, 0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 0x79,
+        0x79, 0x7a, 0x7a, 0x7a, 0x7b, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c,
+        0x7d, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f };
+
+/*
+ * data that needs to be sent to device. sets up card internal stuff.
+ * values dumped from windows driver and filtered by trial'n'error.
+ */
+static const struct {
+        u8 type;
+        u8 reg;
+        u8 value;
+}
+init_data[] = {
+        { 0x22, 0x00, 0x00 }, { 0x20, 0x00, 0x08 }, { 0x22, 0x01, 0x01 },
+        { 0x20, 0x01, 0x08 }, { 0x22, 0x02, 0x00 }, { 0x20, 0x02, 0x08 },
+        { 0x22, 0x03, 0x00 }, { 0x20, 0x03, 0x08 }, { 0x22, 0x04, 0x00 },
+        { 0x20, 0x04, 0x08 }, { 0x22, 0x05, 0x01 }, { 0x20, 0x05, 0x08 },
+        { 0x22, 0x04, 0x01 }, { 0x12, 0x04, 0x00 }, { 0x12, 0x05, 0x00 },
+        { 0x12, 0x0d, 0x78 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 },
+        { 0x12, 0x23, 0x00 }, { 0x12, 0x06, 0x02 }, { 0x12, 0x03, 0x00 },
+        { 0x12, 0x02, 0x00 }, { 0x22, 0x03, 0x01 },
+        { 0 } /* TERMINATING ENTRY */
+};
+
+static void usb6fire_control_master_vol_update(struct control_runtime *rt)
+{
+        struct comm_runtime *comm_rt = rt->chip->comm;
+        if (comm_rt) {
+                /* set volume */
+                comm_rt->write8(comm_rt, 0x12, 0x0f, 0x7f -
+                                log_volume_table[rt->master_vol]);
+                 /* unmute */
+                comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00);
+        }
+}
+
+static void usb6fire_control_line_phono_update(struct control_runtime *rt)
+{
+        struct comm_runtime *comm_rt = rt->chip->comm;
+        if (comm_rt) {
+                comm_rt->write8(comm_rt, 0x22, 0x02, rt->line_phono_switch);
+                comm_rt->write8(comm_rt, 0x21, 0x02, rt->line_phono_switch);
+        }
+}
+
+static void usb6fire_control_opt_coax_update(struct control_runtime *rt)
+{
+        struct comm_runtime *comm_rt = rt->chip->comm;
+        if (comm_rt) {
+                comm_rt->write8(comm_rt, 0x22, 0x00, rt->opt_coax_switch);
+                comm_rt->write8(comm_rt, 0x21, 0x00, rt->opt_coax_switch);
+        }
+}
+
+static int usb6fire_control_master_vol_info(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 127;
+        return 0;
+}
+
+static int usb6fire_control_master_vol_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        int changed = 0;
+        if (rt->master_vol != ucontrol->value.integer.value[0]) {
+                rt->master_vol = ucontrol->value.integer.value[0];
+                usb6fire_control_master_vol_update(rt);
+                changed = 1;
+        }
+        return changed;
+}
+
+static int usb6fire_control_master_vol_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = rt->master_vol;
+        return 0;
+}
+
+static int usb6fire_control_line_phono_info(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name,
+                        line_phono_texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int usb6fire_control_line_phono_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        int changed = 0;
+        if (rt->line_phono_switch != ucontrol->value.integer.value[0]) {
+                rt->line_phono_switch = ucontrol->value.integer.value[0];
+                usb6fire_control_line_phono_update(rt);
+                changed = 1;
+        }
+        return changed;
+}
+
+static int usb6fire_control_line_phono_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = rt->line_phono_switch;
+        return 0;
+}
+
+static int usb6fire_control_opt_coax_info(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name,
+                        opt_coax_texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int usb6fire_control_opt_coax_put(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        int changed = 0;
+
+        if (rt->opt_coax_switch != ucontrol->value.enumerated.item[0]) {
+                rt->opt_coax_switch = ucontrol->value.enumerated.item[0];
+                usb6fire_control_opt_coax_update(rt);
+                changed = 1;
+        }
+        return changed;
+}
+
+static int usb6fire_control_opt_coax_get(struct snd_kcontrol *kcontrol,
+                struct snd_ctl_elem_value *ucontrol)
+{
+        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.enumerated.item[0] = rt->opt_coax_switch;
+        return 0;
+}
+
+static struct __devinitdata snd_kcontrol_new elements[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Volume",
+                .index = 0,
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+                .info = usb6fire_control_master_vol_info,
+                .get = usb6fire_control_master_vol_get,
+                .put = usb6fire_control_master_vol_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Line/Phono Capture Route",
+                .index = 0,
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+                .info = usb6fire_control_line_phono_info,
+                .get = usb6fire_control_line_phono_get,
+                .put = usb6fire_control_line_phono_put
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Opt/Coax Capture Route",
+                .index = 0,
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+                .info = usb6fire_control_opt_coax_info,
+                .get = usb6fire_control_opt_coax_get,
+                .put = usb6fire_control_opt_coax_put
+        },
+        {}
+};
+
+int __devinit usb6fire_control_init(struct sfire_chip *chip)
+{
+        int i;
+        int ret;
+        struct control_runtime *rt = kzalloc(sizeof(struct control_runtime),
+                        GFP_KERNEL);
+        struct comm_runtime *comm_rt = chip->comm;
+
+        if (!rt)
+                return -ENOMEM;
+
+        rt->chip = chip;
+
+        i = 0;
+        while (init_data[i].type) {
+                comm_rt->write8(comm_rt, init_data[i].type, init_data[i].reg,
+                                init_data[i].value);
+                i++;
+        }
+
+        usb6fire_control_opt_coax_update(rt);
+        usb6fire_control_line_phono_update(rt);
+        usb6fire_control_master_vol_update(rt);
+
+        i = 0;
+        while (elements[i].name) {
+                ret = snd_ctl_add(chip->card, snd_ctl_new1(&elements[i], rt));
+                if (ret < 0) {
+                        kfree(rt);
+                        snd_printk(KERN_ERR PREFIX "cannot add control.\n");
+                        return ret;
+                }
+                i++;
+        }
+
+        chip->control = rt;
+        return 0;
+}
+
+void usb6fire_control_abort(struct sfire_chip *chip)
+{}
+
+void usb6fire_control_destroy(struct sfire_chip *chip)
+{
+        kfree(chip->control);
+        chip->control = NULL;
+}
diff --git a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h
new file mode 100644
index 000000000000..b534c777ab02
--- /dev/null
+++ b/sound/usb/6fire/control.h
@@ -0,0 +1,37 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_CONTROL_H
+#define USB6FIRE_CONTROL_H
+
+#include "common.h"
+
+enum {
+        CONTROL_MAX_ELEMENTS = 32
+};
+
+struct control_runtime {
+        struct sfire_chip *chip;
+
+        struct snd_kcontrol *element[CONTROL_MAX_ELEMENTS];
+        bool opt_coax_switch;
+        bool line_phono_switch;
+        u8 master_vol;
+};
+
+int __devinit usb6fire_control_init(struct sfire_chip *chip);
+void usb6fire_control_abort(struct sfire_chip *chip);
+void usb6fire_control_destroy(struct sfire_chip *chip);
+#endif /* USB6FIRE_CONTROL_H */
+
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
new file mode 100644
index 000000000000..9081a54a9c6c
--- /dev/null
+++ b/sound/usb/6fire/firmware.c
@@ -0,0 +1,426 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Firmware loader
+ *
+ * Currently not working for all devices. To be able to use the device
+ * in linux, it is also possible to let the windows driver upload the firmware.
+ * For that, start the computer in windows and reboot.
+ * As long as the device is connected to the power supply, no firmware reload
+ * needs to be performed.
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/firmware.h>
+
+#include "firmware.h"
+#include "chip.h"
+
+MODULE_FIRMWARE("6fire/dmx6firel2.ihx");
+MODULE_FIRMWARE("6fire/dmx6fireap.ihx");
+MODULE_FIRMWARE("6fire/dmx6firecf.bin");
+
+enum {
+        FPGA_BUFSIZE = 512, FPGA_EP = 2
+};
+
+static const u8 BIT_REVERSE_TABLE[256] = {
+        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50,
+        0xd0, 0x30, 0xb0, 0x70, 0xf0, 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8,
+        0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, 0x04,
+        0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4,
+        0x34, 0xb4, 0x74, 0xf4, 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c,
+        0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, 0x02, 0x82,
+        0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32,
+        0xb2, 0x72, 0xf2, 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, 0x06, 0x86, 0x46,
+        0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6,
+        0x76, 0xf6, 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e,
+        0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, 0x01, 0x81, 0x41, 0xc1,
+        0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71,
+        0xf1, 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99,
+        0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, 0x05, 0x85, 0x45, 0xc5, 0x25,
+        0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d,
+        0xdd, 0x3d, 0xbd, 0x7d, 0xfd, 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3,
+        0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, 0x0b,
+        0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb,
+        0x3b, 0xbb, 0x7b, 0xfb, 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67,
+        0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, 0x0f, 0x8f,
+        0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f,
+        0xbf, 0x7f, 0xff };
+
+/*
+ * wMaxPacketSize of pcm endpoints.
+ * keep synced with rates_in_packet_size and rates_out_packet_size in pcm.c
+ * fpp: frames per isopacket
+ *
+ * CAUTION: keep sizeof <= buffer[] in usb6fire_fw_init
+ */
+static const u8 ep_w_max_packet_size[] = {
+        0xe4, 0x00, 0xe4, 0x00, /* alt 1: 228 EP2 and EP6 (7 fpp) */
+        0xa4, 0x01, 0xa4, 0x01, /* alt 2: 420 EP2 and EP6 (13 fpp)*/
+        0x94, 0x01, 0x5c, 0x02  /* alt 3: 404 EP2 and 604 EP6 (25 fpp) */
+};
+
+struct ihex_record {
+        u16 address;
+        u8 len;
+        u8 data[256];
+        char error; /* true if an error occured parsing this record */
+
+        u8 max_len; /* maximum record length in whole ihex */
+
+        /* private */
+        const char *txt_data;
+        unsigned int txt_length;
+        unsigned int txt_offset; /* current position in txt_data */
+};
+
+static u8 usb6fire_fw_ihex_nibble(const u8 n)
+{
+        if (n >= '0' && n <= '9')
+                return n - '0';
+        else if (n >= 'A' && n <= 'F')
+                return n - ('A' - 10);
+        else if (n >= 'a' && n <= 'f')
+                return n - ('a' - 10);
+        return 0;
+}
+
+static u8 usb6fire_fw_ihex_hex(const u8 *data, u8 *crc)
+{
+        u8 val = (usb6fire_fw_ihex_nibble(data[0]) << 4) |
+                        usb6fire_fw_ihex_nibble(data[1]);
+        *crc += val;
+        return val;
+}
+
+/*
+ * returns true if record is available, false otherwise.
+ * iff an error occured, false will be returned and record->error will be true.
+ */
+static bool usb6fire_fw_ihex_next_record(struct ihex_record *record)
+{
+        u8 crc = 0;
+        u8 type;
+        int i;
+
+        record->error = false;
+
+        /* find begin of record (marked by a colon) */
+        while (record->txt_offset < record->txt_length
+                        && record->txt_data[record->txt_offset] != ':')
+                record->txt_offset++;
+        if (record->txt_offset == record->txt_length)
+                return false;
+
+        /* number of characters needed for len, addr and type entries */
+        record->txt_offset++;
+        if (record->txt_offset + 8 > record->txt_length) {
+                record->error = true;
+                return false;
+        }
+
+        record->len = usb6fire_fw_ihex_hex(record->txt_data +
+                        record->txt_offset, &crc);
+        record->txt_offset += 2;
+        record->address = usb6fire_fw_ihex_hex(record->txt_data +
+                        record->txt_offset, &crc) << 8;
+        record->txt_offset += 2;
+        record->address |= usb6fire_fw_ihex_hex(record->txt_data +
+                        record->txt_offset, &crc);
+        record->txt_offset += 2;
+        type = usb6fire_fw_ihex_hex(record->txt_data +
+                        record->txt_offset, &crc);
+        record->txt_offset += 2;
+
+        /* number of characters needed for data and crc entries */
+        if (record->txt_offset + 2 * (record->len + 1) > record->txt_length) {
+                record->error = true;
+                return false;
+        }
+        for (i = 0; i < record->len; i++) {
+                record->data[i] = usb6fire_fw_ihex_hex(record->txt_data
+                                + record->txt_offset, &crc);
+                record->txt_offset += 2;
+        }
+        usb6fire_fw_ihex_hex(record->txt_data + record->txt_offset, &crc);
+        if (crc) {
+                record->error = true;
+                return false;
+        }
+
+        if (type == 1 || !record->len) /* eof */
+                return false;
+        else if (type == 0)
+                return true;
+        else {
+                record->error = true;
+                return false;
+        }
+}
+
+static int usb6fire_fw_ihex_init(const struct firmware *fw,
+                struct ihex_record *record)
+{
+        record->txt_data = fw->data;
+        record->txt_length = fw->size;
+        record->txt_offset = 0;
+        record->max_len = 0;
+        /* read all records, if loop ends, record->error indicates,
+         * whether ihex is valid. */
+        while (usb6fire_fw_ihex_next_record(record))
+                record->max_len = max(record->len, record->max_len);
+        if (record->error)
+                return -EINVAL;
+        record->txt_offset = 0;
+        return 0;
+}
+
+static int usb6fire_fw_ezusb_write(struct usb_device *device,
+                int type, int value, char *data, int len)
+{
+        int ret;
+
+        ret = usb_control_msg(device, usb_sndctrlpipe(device, 0), type,
+                        USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                        value, 0, data, len, HZ);
+        if (ret < 0)
+                return ret;
+        else if (ret != len)
+                return -EIO;
+        return 0;
+}
+
+static int usb6fire_fw_ezusb_read(struct usb_device *device,
+                int type, int value, char *data, int len)
+{
+        int ret = usb_control_msg(device, usb_rcvctrlpipe(device, 0), type,
+                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, value,
+                        0, data, len, HZ);
+        if (ret < 0)
+                return ret;
+        else if (ret != len)
+                return -EIO;
+        return 0;
+}
+
+static int usb6fire_fw_fpga_write(struct usb_device *device,
+                char *data, int len)
+{
+        int actual_len;
+        int ret;
+
+        ret = usb_bulk_msg(device, usb_sndbulkpipe(device, FPGA_EP), data, len,
+                        &actual_len, HZ);
+        if (ret < 0)
+                return ret;
+        else if (actual_len != len)
+                return -EIO;
+        return 0;
+}
+
+static int usb6fire_fw_ezusb_upload(
+                struct usb_interface *intf, const char *fwname,
+                unsigned int postaddr, u8 *postdata, unsigned int postlen)
+{
+        int ret;
+        u8 data;
+        struct usb_device *device = interface_to_usbdev(intf);
+        const struct firmware *fw = 0;
+        struct ihex_record *rec = kmalloc(sizeof(struct ihex_record),
+                        GFP_KERNEL);
+
+        if (!rec)
+                return -ENOMEM;
+
+        ret = request_firmware(&fw, fwname, &device->dev);
+        if (ret < 0) {
+                kfree(rec);
+                snd_printk(KERN_ERR PREFIX "error requesting ezusb "
+                                "firmware %s.\n", fwname);
+                return ret;
+        }
+        ret = usb6fire_fw_ihex_init(fw, rec);
+        if (ret < 0) {
+                kfree(rec);
+                snd_printk(KERN_ERR PREFIX "error validating ezusb "
+                                "firmware %s.\n", fwname);
+                return ret;
+        }
+        /* upload firmware image */
+        data = 0x01; /* stop ezusb cpu */
+        ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
+        if (ret < 0) {
+                kfree(rec);
+                release_firmware(fw);
+                snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
+                                "firmware %s: begin message.\n", fwname);
+                return ret;
+        }
+
+        while (usb6fire_fw_ihex_next_record(rec)) { /* write firmware */
+                ret = usb6fire_fw_ezusb_write(device, 0xa0, rec->address,
+                                rec->data, rec->len);
+                if (ret < 0) {
+                        kfree(rec);
+                        release_firmware(fw);
+                        snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
+                                        "firmware %s: data urb.\n", fwname);
+                        return ret;
+                }
+        }
+
+        release_firmware(fw);
+        kfree(rec);
+        if (postdata) { /* write data after firmware has been uploaded */
+                ret = usb6fire_fw_ezusb_write(device, 0xa0, postaddr,
+                                postdata, postlen);
+                if (ret < 0) {
+                        snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
+                                        "firmware %s: post urb.\n", fwname);
+                        return ret;
+                }
+        }
+
+        data = 0x00; /* resume ezusb cpu */
+        ret = usb6fire_fw_ezusb_write(device, 0xa0, 0xe600, &data, 1);
+        if (ret < 0) {
+                release_firmware(fw);
+                snd_printk(KERN_ERR PREFIX "unable to upload ezusb "
+                                "firmware %s: end message.\n", fwname);
+                return ret;
+        }
+        return 0;
+}
+
+static int usb6fire_fw_fpga_upload(
+                struct usb_interface *intf, const char *fwname)
+{
+        int ret;
+        int i;
+        struct usb_device *device = interface_to_usbdev(intf);
+        u8 *buffer = kmalloc(FPGA_BUFSIZE, GFP_KERNEL);
+        const char *c;
+        const char *end;
+        const struct firmware *fw;
+
+        if (!buffer)
+                return -ENOMEM;
+
+        ret = request_firmware(&fw, fwname, &device->dev);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "unable to get fpga firmware %s.\n",
+                                fwname);
+                kfree(buffer);
+                return -EIO;
+        }
+
+        c = fw->data;
+        end = fw->data + fw->size;
+
+        ret = usb6fire_fw_ezusb_write(device, 8, 0, NULL, 0);
+        if (ret < 0) {
+                kfree(buffer);
+                release_firmware(fw);
+                snd_printk(KERN_ERR PREFIX "unable to upload fpga firmware: "
+                                "begin urb.\n");
+                return ret;
+        }
+
+        while (c != end) {
+                for (i = 0; c != end && i < FPGA_BUFSIZE; i++, c++)
+                        buffer[i] = BIT_REVERSE_TABLE[(u8) *c];
+
+                ret = usb6fire_fw_fpga_write(device, buffer, i);
+                if (ret < 0) {
+                        release_firmware(fw);
+                        kfree(buffer);
+                        snd_printk(KERN_ERR PREFIX "unable to upload fpga "
+                                        "firmware: fw urb.\n");
+                        return ret;
+                }
+        }
+        release_firmware(fw);
+        kfree(buffer);
+
+        ret = usb6fire_fw_ezusb_write(device, 9, 0, NULL, 0);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "unable to upload fpga firmware: "
+                                "end urb.\n");
+                return ret;
+        }
+        return 0;
+}
+
+int usb6fire_fw_init(struct usb_interface *intf)
+{
+        int i;
+        int ret;
+        struct usb_device *device = interface_to_usbdev(intf);
+        /* buffer: 8 receiving bytes from device and
+         * sizeof(EP_W_MAX_PACKET_SIZE) bytes for non-const copy */
+        u8 buffer[12];
+
+        ret = usb6fire_fw_ezusb_read(device, 1, 0, buffer, 8);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "unable to receive device "
+                                "firmware state.\n");
+                return ret;
+        }
+        if (buffer[0] != 0xeb || buffer[1] != 0xaa || buffer[2] != 0x55
+                        || buffer[4] != 0x03 || buffer[5] != 0x01 || buffer[7]
+                        != 0x00) {
+                snd_printk(KERN_ERR PREFIX "unknown device firmware state "
+                                "received from device: ");
+                for (i = 0; i < 8; i++)
+                        snd_printk("%02x ", buffer[i]);
+                snd_printk("\n");
+                return -EIO;
+        }
+        /* do we need fpga loader ezusb firmware? */
+        if (buffer[3] == 0x01 && buffer[6] == 0x19) {
+                ret = usb6fire_fw_ezusb_upload(intf,
+                                "6fire/dmx6firel2.ihx", 0, NULL, 0);
+                if (ret < 0)
+                        return ret;
+                return FW_NOT_READY;
+        }
+        /* do we need fpga firmware and application ezusb firmware? */
+        else if (buffer[3] == 0x02 && buffer[6] == 0x0b) {
+                ret = usb6fire_fw_fpga_upload(intf, "6fire/dmx6firecf.bin");
+                if (ret < 0)
+                        return ret;
+                memcpy(buffer, ep_w_max_packet_size,
+                                sizeof(ep_w_max_packet_size));
+                ret = usb6fire_fw_ezusb_upload(intf, "6fire/dmx6fireap.ihx",
+                                0x0003, buffer, sizeof(ep_w_max_packet_size));
+                if (ret < 0)
+                        return ret;
+                return FW_NOT_READY;
+        }
+        /* all fw loaded? */
+        else if (buffer[3] == 0x03 && buffer[6] == 0x0b)
+                return 0;
+        /* unknown data? */
+        else {
+                snd_printk(KERN_ERR PREFIX "unknown device firmware state "
+                                "received from device: ");
+                for (i = 0; i < 8; i++)
+                        snd_printk("%02x ", buffer[i]);
+                snd_printk("\n");
+                return -EIO;
+        }
+        return 0;
+}
+
diff --git a/sound/usb/6fire/firmware.h b/sound/usb/6fire/firmware.h
new file mode 100644
index 000000000000..008569895381
--- /dev/null
+++ b/sound/usb/6fire/firmware.h
@@ -0,0 +1,27 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author: Torsten Schenk
+ * Created: Jan 01, 2011
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_FIRMWARE_H
+#define USB6FIRE_FIRMWARE_H
+
+#include "common.h"
+
+enum /* firmware state of device */
+{
+        FW_READY = 0,
+        FW_NOT_READY = 1
+};
+
+int __devinit usb6fire_fw_init(struct usb_interface *intf);
+#endif /* USB6FIRE_FIRMWARE_H */
+
diff --git a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c
new file mode 100644
index 000000000000..13f4509dce2b
--- /dev/null
+++ b/sound/usb/6fire/midi.c
@@ -0,0 +1,203 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Rawmidi driver
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <sound/rawmidi.h>
+
+#include "midi.h"
+#include "chip.h"
+#include "comm.h"
+
+static void usb6fire_midi_out_handler(struct urb *urb)
+{
+        struct midi_runtime *rt = urb->context;
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rt->out_lock, flags);
+
+        if (rt->out) {
+                ret = snd_rawmidi_transmit(rt->out, rt->out_buffer + 4,
+                                MIDI_BUFSIZE - 4);
+                if (ret > 0) { /* more data available, send next packet */
+                        rt->out_buffer[1] = ret + 2;
+                        rt->out_buffer[3] = rt->out_serial++;
+                        urb->transfer_buffer_length = ret + 4;
+
+                        ret = usb_submit_urb(urb, GFP_ATOMIC);
+                        if (ret < 0)
+                                snd_printk(KERN_ERR PREFIX "midi out urb "
+                                                "submit failed: %d\n", ret);
+                } else /* no more data to transmit */
+                        rt->out = NULL;
+        }
+        spin_unlock_irqrestore(&rt->out_lock, flags);
+}
+
+static void usb6fire_midi_in_received(
+                struct midi_runtime *rt, u8 *data, int length)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&rt->in_lock, flags);
+        if (rt->in)
+                snd_rawmidi_receive(rt->in, data, length);
+        spin_unlock_irqrestore(&rt->in_lock, flags);
+}
+
+static int usb6fire_midi_out_open(struct snd_rawmidi_substream *alsa_sub)
+{
+        return 0;
+}
+
+static int usb6fire_midi_out_close(struct snd_rawmidi_substream *alsa_sub)
+{
+        return 0;
+}
+
+static void usb6fire_midi_out_trigger(
+                struct snd_rawmidi_substream *alsa_sub, int up)
+{
+        struct midi_runtime *rt = alsa_sub->rmidi->private_data;
+        struct urb *urb = &rt->out_urb;
+        __s8 ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rt->out_lock, flags);
+        if (up) { /* start transfer */
+                if (rt->out) { /* we are already transmitting so just return */
+                        spin_unlock_irqrestore(&rt->out_lock, flags);
+                        return;
+                }
+
+                ret = snd_rawmidi_transmit(alsa_sub, rt->out_buffer + 4,
+                                MIDI_BUFSIZE - 4);
+                if (ret > 0) {
+                        rt->out_buffer[1] = ret + 2;
+                        rt->out_buffer[3] = rt->out_serial++;
+                        urb->transfer_buffer_length = ret + 4;
+
+                        ret = usb_submit_urb(urb, GFP_ATOMIC);
+                        if (ret < 0)
+                                snd_printk(KERN_ERR PREFIX "midi out urb "
+                                                "submit failed: %d\n", ret);
+                        else
+                                rt->out = alsa_sub;
+                }
+        } else if (rt->out == alsa_sub)
+                rt->out = NULL;
+        spin_unlock_irqrestore(&rt->out_lock, flags);
+}
+
+static void usb6fire_midi_out_drain(struct snd_rawmidi_substream *alsa_sub)
+{
+        struct midi_runtime *rt = alsa_sub->rmidi->private_data;
+        int retry = 0;
+
+        while (rt->out && retry++ < 100)
+                msleep(10);
+}
+
+static int usb6fire_midi_in_open(struct snd_rawmidi_substream *alsa_sub)
+{
+        return 0;
+}
+
+static int usb6fire_midi_in_close(struct snd_rawmidi_substream *alsa_sub)
+{
+        return 0;
+}
+
+static void usb6fire_midi_in_trigger(
+                struct snd_rawmidi_substream *alsa_sub, int up)
+{
+        struct midi_runtime *rt = alsa_sub->rmidi->private_data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rt->in_lock, flags);
+        if (up)
+                rt->in = alsa_sub;
+        else
+                rt->in = NULL;
+        spin_unlock_irqrestore(&rt->in_lock, flags);
+}
+
+static struct snd_rawmidi_ops out_ops = {
+        .open = usb6fire_midi_out_open,
+        .close = usb6fire_midi_out_close,
+        .trigger = usb6fire_midi_out_trigger,
+        .drain = usb6fire_midi_out_drain
+};
+
+static struct snd_rawmidi_ops in_ops = {
+        .open = usb6fire_midi_in_open,
+        .close = usb6fire_midi_in_close,
+        .trigger = usb6fire_midi_in_trigger
+};
+
+int __devinit usb6fire_midi_init(struct sfire_chip *chip)
+{
+        int ret;
+        struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime),
+                        GFP_KERNEL);
+        struct comm_runtime *comm_rt = chip->comm;
+
+        if (!rt)
+                return -ENOMEM;
+
+        rt->chip = chip;
+        rt->in_received = usb6fire_midi_in_received;
+        rt->out_buffer[0] = 0x80; /* 'send midi' command */
+        rt->out_buffer[1] = 0x00; /* size of data */
+        rt->out_buffer[2] = 0x00; /* always 0 */
+        spin_lock_init(&rt->in_lock);
+        spin_lock_init(&rt->out_lock);
+
+        comm_rt->init_urb(comm_rt, &rt->out_urb, rt->out_buffer, rt,
+                        usb6fire_midi_out_handler);
+
+        ret = snd_rawmidi_new(chip->card, "6FireUSB", 0, 1, 1, &rt->instance);
+        if (ret < 0) {
+                kfree(rt);
+                snd_printk(KERN_ERR PREFIX "unable to create midi.\n");
+                return ret;
+        }
+        rt->instance->private_data = rt;
+        strcpy(rt->instance->name, "DMX6FireUSB MIDI");
+        rt->instance->info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |
+                        SNDRV_RAWMIDI_INFO_INPUT |
+                        SNDRV_RAWMIDI_INFO_DUPLEX;
+        snd_rawmidi_set_ops(rt->instance, SNDRV_RAWMIDI_STREAM_OUTPUT,
+                        &out_ops);
+        snd_rawmidi_set_ops(rt->instance, SNDRV_RAWMIDI_STREAM_INPUT,
+                        &in_ops);
+
+        chip->midi = rt;
+        return 0;
+}
+
+void usb6fire_midi_abort(struct sfire_chip *chip)
+{
+        struct midi_runtime *rt = chip->midi;
+
+        if (rt)
+                usb_poison_urb(&rt->out_urb);
+}
+
+void usb6fire_midi_destroy(struct sfire_chip *chip)
+{
+        kfree(chip->midi);
+        chip->midi = NULL;
+}
diff --git a/sound/usb/6fire/midi.h b/sound/usb/6fire/midi.h
new file mode 100644
index 000000000000..97a7bf669135
--- /dev/null
+++ b/sound/usb/6fire/midi.h
@@ -0,0 +1,46 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_MIDI_H
+#define USB6FIRE_MIDI_H
+
+#include "common.h"
+
+enum {
+        MIDI_BUFSIZE = 64
+};
+
+struct midi_runtime {
+        struct sfire_chip *chip;
+        struct snd_rawmidi *instance;
+
+        struct snd_rawmidi_substream *in;
+        char in_active;
+
+        spinlock_t in_lock;
+        spinlock_t out_lock;
+        struct snd_rawmidi_substream *out;
+        struct urb out_urb;
+        u8 out_serial; /* serial number of out packet */
+        u8 out_buffer[MIDI_BUFSIZE];
+        int buffer_offset;
+
+        void (*in_received)(struct midi_runtime *rt, u8 *data, int length);
+};
+
+int __devinit usb6fire_midi_init(struct sfire_chip *chip);
+void usb6fire_midi_abort(struct sfire_chip *chip);
+void usb6fire_midi_destroy(struct sfire_chip *chip);
+#endif /* USB6FIRE_MIDI_H */
+
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
new file mode 100644
index 000000000000..ba62c7468ba8
--- /dev/null
+++ b/sound/usb/6fire/pcm.c
@@ -0,0 +1,688 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * PCM driver
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include "pcm.h"
+#include "chip.h"
+#include "comm.h"
+
+enum {
+        OUT_N_CHANNELS = 6, IN_N_CHANNELS = 4
+};
+
+/* keep next two synced with
+ * FW_EP_W_MAX_PACKET_SIZE[] and RATES_MAX_PACKET_SIZE */
+static const int rates_in_packet_size[] = { 228, 228, 420, 420, 404, 404 };
+static const int rates_out_packet_size[] = { 228, 228, 420, 420, 604, 604 };
+static const int rates[] = { 44100, 48000, 88200, 96000, 176400, 192000 };
+static const int rates_altsetting[] = { 1, 1, 2, 2, 3, 3 };
+static const int rates_alsaid[] = {
+        SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_48000,
+        SNDRV_PCM_RATE_88200, SNDRV_PCM_RATE_96000,
+        SNDRV_PCM_RATE_176400, SNDRV_PCM_RATE_192000 };
+
+/* values to write to soundcard register for all samplerates */
+static const u16 rates_6fire_vl[] = {0x00, 0x01, 0x00, 0x01, 0x00, 0x01};
+static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00};
+
+enum { /* settings for pcm */
+        OUT_EP = 6, IN_EP = 2, MAX_BUFSIZE = 128 * 1024
+};
+
+enum { /* pcm streaming states */
+        STREAM_DISABLED, /* no pcm streaming */
+        STREAM_STARTING, /* pcm streaming requested, waiting to become ready */
+        STREAM_RUNNING, /* pcm streaming running */
+        STREAM_STOPPING
+};
+
+enum { /* pcm sample rates (also index into RATES_XXX[]) */
+        RATE_44KHZ,
+        RATE_48KHZ,
+        RATE_88KHZ,
+        RATE_96KHZ,
+        RATE_176KHZ,
+        RATE_192KHZ
+};
+
+static const struct snd_pcm_hardware pcm_hw = {
+        .info = SNDRV_PCM_INFO_MMAP |
+                SNDRV_PCM_INFO_INTERLEAVED |
+                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                SNDRV_PCM_INFO_MMAP_VALID |
+                SNDRV_PCM_INFO_BATCH,
+
+        .formats = SNDRV_PCM_FMTBIT_S24_LE,
+
+        .rates = SNDRV_PCM_RATE_44100 |
+                SNDRV_PCM_RATE_48000 |
+                SNDRV_PCM_RATE_88200 |
+                SNDRV_PCM_RATE_96000 |
+                SNDRV_PCM_RATE_176400 |
+                SNDRV_PCM_RATE_192000,
+
+        .rate_min = 44100,
+        .rate_max = 192000,
+        .channels_min = 1,
+        .channels_max = 0, /* set in pcm_open, depending on capture/playback */
+        .buffer_bytes_max = MAX_BUFSIZE,
+        .period_bytes_min = PCM_N_PACKETS_PER_URB * (PCM_MAX_PACKET_SIZE - 4),
+        .period_bytes_max = MAX_BUFSIZE,
+        .periods_min = 2,
+        .periods_max = 1024
+};
+
+static int usb6fire_pcm_set_rate(struct pcm_runtime *rt)
+{
+        int ret;
+        struct usb_device *device = rt->chip->dev;
+        struct comm_runtime *comm_rt = rt->chip->comm;
+
+        if (rt->rate >= ARRAY_SIZE(rates))
+                return -EINVAL;
+        /* disable streaming */
+        ret = comm_rt->write16(comm_rt, 0x02, 0x00, 0x00, 0x00);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error stopping streaming while "
+                                "setting samplerate %d.\n", rates[rt->rate]);
+                return ret;
+        }
+
+        ret = usb_set_interface(device, 1, rates_altsetting[rt->rate]);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error setting interface "
+                                "altsetting %d for samplerate %d.\n",
+                                rates_altsetting[rt->rate], rates[rt->rate]);
+                return ret;
+        }
+
+        /* set soundcard clock */
+        ret = comm_rt->write16(comm_rt, 0x02, 0x01, rates_6fire_vl[rt->rate],
+                        rates_6fire_vh[rt->rate]);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error setting samplerate %d.\n",
+                                rates[rt->rate]);
+                return ret;
+        }
+
+        /* enable analog inputs and outputs
+         * (one bit per stereo-channel) */
+        ret = comm_rt->write16(comm_rt, 0x02, 0x02,
+                        (1 << (OUT_N_CHANNELS / 2)) - 1,
+                        (1 << (IN_N_CHANNELS / 2)) - 1);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error initializing analog channels "
+                                "while setting samplerate %d.\n",
+                                rates[rt->rate]);
+                return ret;
+        }
+        /* disable digital inputs and outputs */
+        ret = comm_rt->write16(comm_rt, 0x02, 0x03, 0x00, 0x00);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error initializing digital "
+                                "channels while setting samplerate %d.\n",
+                                rates[rt->rate]);
+                return ret;
+        }
+
+        ret = comm_rt->write16(comm_rt, 0x02, 0x00, 0x00, 0x01);
+        if (ret < 0) {
+                snd_printk(KERN_ERR PREFIX "error starting streaming while "
+                                "setting samplerate %d.\n", rates[rt->rate]);
+                return ret;
+        }
+
+        rt->in_n_analog = IN_N_CHANNELS;
+        rt->out_n_analog = OUT_N_CHANNELS;
+        rt->in_packet_size = rates_in_packet_size[rt->rate];
+        rt->out_packet_size = rates_out_packet_size[rt->rate];
+        return 0;
+}
+
+static struct pcm_substream *usb6fire_pcm_get_substream(
+                struct snd_pcm_substream *alsa_sub)
+{
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+
+        if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                return &rt->playback;
+        else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE)
+                return &rt->capture;
+        snd_printk(KERN_ERR PREFIX "error getting pcm substream slot.\n");
+        return NULL;
+}
+
+/* call with stream_mutex locked */
+static void usb6fire_pcm_stream_stop(struct pcm_runtime *rt)
+{
+        int i;
+
+        if (rt->stream_state != STREAM_DISABLED) {
+                for (i = 0; i < PCM_N_URBS; i++) {
+                        usb_kill_urb(&rt->in_urbs[i].instance);
+                        usb_kill_urb(&rt->out_urbs[i].instance);
+                }
+                rt->stream_state = STREAM_DISABLED;
+        }
+}
+
+/* call with stream_mutex locked */
+static int usb6fire_pcm_stream_start(struct pcm_runtime *rt)
+{
+        int ret;
+        int i;
+        int k;
+        struct usb_iso_packet_descriptor *packet;
+
+        if (rt->stream_state == STREAM_DISABLED) {
+                /* submit our in urbs */
+                rt->stream_wait_cond = false;
+                rt->stream_state = STREAM_STARTING;
+                for (i = 0; i < PCM_N_URBS; i++) {
+                        for (k = 0; k < PCM_N_PACKETS_PER_URB; k++) {
+                                packet = &rt->in_urbs[i].packets[k];
+                                packet->offset = k * rt->in_packet_size;
+                                packet->length = rt->in_packet_size;
+                                packet->actual_length = 0;
+                                packet->status = 0;
+                        }
+                        ret = usb_submit_urb(&rt->in_urbs[i].instance,
+                                        GFP_ATOMIC);
+                        if (ret) {
+                                usb6fire_pcm_stream_stop(rt);
+                                return ret;
+                        }
+                }
+
+                /* wait for first out urb to return (sent in in urb handler) */
+                wait_event_timeout(rt->stream_wait_queue, rt->stream_wait_cond,
+                                HZ);
+                if (rt->stream_wait_cond)
+                        rt->stream_state = STREAM_RUNNING;
+                else {
+                        usb6fire_pcm_stream_stop(rt);
+                        return -EIO;
+                }
+        }
+        return 0;
+}
+
+/* call with substream locked */
+static void usb6fire_pcm_capture(struct pcm_substream *sub, struct pcm_urb *urb)
+{
+        int i;
+        int frame;
+        int frame_count;
+        unsigned int total_length = 0;
+        struct pcm_runtime *rt = snd_pcm_substream_chip(sub->instance);
+        struct snd_pcm_runtime *alsa_rt = sub->instance->runtime;
+        u32 *src = (u32 *) urb->buffer;
+        u32 *dest = (u32 *) (alsa_rt->dma_area + sub->dma_off
+                        * (alsa_rt->frame_bits >> 3));
+        u32 *dest_end = (u32 *) (alsa_rt->dma_area + alsa_rt->buffer_size
+                        * (alsa_rt->frame_bits >> 3));
+        int bytes_per_frame = alsa_rt->channels << 2;
+
+        for (i = 0; i < PCM_N_PACKETS_PER_URB; i++) {
+                /* at least 4 header bytes for valid packet.
+                 * after that: 32 bits per sample for analog channels */
+                if (urb->packets[i].actual_length > 4)
+                        frame_count = (urb->packets[i].actual_length - 4)
+                                        / (rt->in_n_analog << 2);
+                else
+                        frame_count = 0;
+
+                src = (u32 *) (urb->buffer + total_length);
+                src++; /* skip leading 4 bytes of every packet */
+                total_length += urb->packets[i].length;
+                for (frame = 0; frame < frame_count; frame++) {
+                        memcpy(dest, src, bytes_per_frame);
+                        dest += alsa_rt->channels;
+                        src += rt->in_n_analog;
+                        sub->dma_off++;
+                        sub->period_off++;
+                        if (dest == dest_end) {
+                                sub->dma_off = 0;
+                                dest = (u32 *) alsa_rt->dma_area;
+                        }
+                }
+        }
+}
+
+/* call with substream locked */
+static void usb6fire_pcm_playback(struct pcm_substream *sub,
+                struct pcm_urb *urb)
+{
+        int i;
+        int frame;
+        int frame_count;
+        struct pcm_runtime *rt = snd_pcm_substream_chip(sub->instance);
+        struct snd_pcm_runtime *alsa_rt = sub->instance->runtime;
+        u32 *src = (u32 *) (alsa_rt->dma_area + sub->dma_off
+                        * (alsa_rt->frame_bits >> 3));
+        u32 *src_end = (u32 *) (alsa_rt->dma_area + alsa_rt->buffer_size
+                        * (alsa_rt->frame_bits >> 3));
+        u32 *dest = (u32 *) urb->buffer;
+        int bytes_per_frame = alsa_rt->channels << 2;
+
+        for (i = 0; i < PCM_N_PACKETS_PER_URB; i++) {
+                /* at least 4 header bytes for valid packet.
+                 * after that: 32 bits per sample for analog channels */
+                if (urb->packets[i].length > 4)
+                        frame_count = (urb->packets[i].length - 4)
+                                        / (rt->out_n_analog << 2);
+                else
+                        frame_count = 0;
+                dest++; /* skip leading 4 bytes of every frame */
+                for (frame = 0; frame < frame_count; frame++) {
+                        memcpy(dest, src, bytes_per_frame);
+                        src += alsa_rt->channels;
+                        dest += rt->out_n_analog;
+                        sub->dma_off++;
+                        sub->period_off++;
+                        if (src == src_end) {
+                                src = (u32 *) alsa_rt->dma_area;
+                                sub->dma_off = 0;
+                        }
+                }
+        }
+}
+
+static void usb6fire_pcm_in_urb_handler(struct urb *usb_urb)
+{
+        struct pcm_urb *in_urb = usb_urb->context;
+        struct pcm_urb *out_urb = in_urb->peer;
+        struct pcm_runtime *rt = in_urb->chip->pcm;
+        struct pcm_substream *sub;
+        unsigned long flags;
+        int total_length = 0;
+        int frame_count;
+        int frame;
+        int channel;
+        int i;
+        u8 *dest;
+
+        if (usb_urb->status || rt->panic || rt->stream_state == STREAM_STOPPING)
+                return;
+        for (i = 0; i < PCM_N_PACKETS_PER_URB; i++)
+                if (in_urb->packets[i].status) {
+                        rt->panic = true;
+                        return;
+                }
+
+        if (rt->stream_state == STREAM_DISABLED) {
+                snd_printk(KERN_ERR PREFIX "internal error: "
+                                "stream disabled in in-urb handler.\n");
+                return;
+        }
+
+        /* receive our capture data */
+        sub = &rt->capture;
+        spin_lock_irqsave(&sub->lock, flags);
+        if (sub->active) {
+                usb6fire_pcm_capture(sub, in_urb);
+                if (sub->period_off >= sub->instance->runtime->period_size) {
+                        sub->period_off %= sub->instance->runtime->period_size;
+                        spin_unlock_irqrestore(&sub->lock, flags);
+                        snd_pcm_period_elapsed(sub->instance);
+                } else
+                        spin_unlock_irqrestore(&sub->lock, flags);
+        } else
+                spin_unlock_irqrestore(&sub->lock, flags);
+
+        /* setup out urb structure */
+        for (i = 0; i < PCM_N_PACKETS_PER_URB; i++) {
+                out_urb->packets[i].offset = total_length;
+                out_urb->packets[i].length = (in_urb->packets[i].actual_length
+                                - 4) / (rt->in_n_analog << 2)
+                                * (rt->out_n_analog << 2) + 4;
+                out_urb->packets[i].status = 0;
+                total_length += out_urb->packets[i].length;
+        }
+        memset(out_urb->buffer, 0, total_length);
+
+        /* now send our playback data (if a free out urb was found) */
+        sub = &rt->playback;
+        spin_lock_irqsave(&sub->lock, flags);
+        if (sub->active) {
+                usb6fire_pcm_playback(sub, out_urb);
+                if (sub->period_off >= sub->instance->runtime->period_size) {
+                        sub->period_off %= sub->instance->runtime->period_size;
+                        spin_unlock_irqrestore(&sub->lock, flags);
+                        snd_pcm_period_elapsed(sub->instance);
+                } else
+                        spin_unlock_irqrestore(&sub->lock, flags);
+        } else
+                spin_unlock_irqrestore(&sub->lock, flags);
+
+        /* setup the 4th byte of each sample (0x40 for analog channels) */
+        dest = out_urb->buffer;
+        for (i = 0; i < PCM_N_PACKETS_PER_URB; i++)
+                if (out_urb->packets[i].length >= 4) {
+                        frame_count = (out_urb->packets[i].length - 4)
+                                        / (rt->out_n_analog << 2);
+                        *(dest++) = 0xaa;
+                        *(dest++) = 0xaa;
+                        *(dest++) = frame_count;
+                        *(dest++) = 0x00;
+                        for (frame = 0; frame < frame_count; frame++)
+                                for (channel = 0;
+                                                channel < rt->out_n_analog;
+                                                channel++) {
+                                        dest += 3; /* skip sample data */
+                                        *(dest++) = 0x40;
+                                }
+                }
+        usb_submit_urb(&out_urb->instance, GFP_ATOMIC);
+        usb_submit_urb(&in_urb->instance, GFP_ATOMIC);
+}
+
+static void usb6fire_pcm_out_urb_handler(struct urb *usb_urb)
+{
+        struct pcm_urb *urb = usb_urb->context;
+        struct pcm_runtime *rt = urb->chip->pcm;
+
+        if (rt->stream_state == STREAM_STARTING) {
+                rt->stream_wait_cond = true;
+                wake_up(&rt->stream_wait_queue);
+        }
+}
+
+static int usb6fire_pcm_open(struct snd_pcm_substream *alsa_sub)
+{
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+        struct pcm_substream *sub = NULL;
+        struct snd_pcm_runtime *alsa_rt = alsa_sub->runtime;
+
+        if (rt->panic)
+                return -EPIPE;
+
+        mutex_lock(&rt->stream_mutex);
+        alsa_rt->hw = pcm_hw;
+
+        if (alsa_sub->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                if (rt->rate >= 0)
+                        alsa_rt->hw.rates = rates_alsaid[rt->rate];
+                alsa_rt->hw.channels_max = OUT_N_CHANNELS;
+                sub = &rt->playback;
+        } else if (alsa_sub->stream == SNDRV_PCM_STREAM_CAPTURE) {
+                if (rt->rate >= 0)
+                        alsa_rt->hw.rates = rates_alsaid[rt->rate];
+                alsa_rt->hw.channels_max = IN_N_CHANNELS;
+                sub = &rt->capture;
+        }
+
+        if (!sub) {
+                mutex_unlock(&rt->stream_mutex);
+                snd_printk(KERN_ERR PREFIX "invalid stream type.\n");
+                return -EINVAL;
+        }
+
+        sub->instance = alsa_sub;
+        sub->active = false;
+        mutex_unlock(&rt->stream_mutex);
+        return 0;
+}
+
+static int usb6fire_pcm_close(struct snd_pcm_substream *alsa_sub)
+{
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+        struct pcm_substream *sub = usb6fire_pcm_get_substream(alsa_sub);
+        unsigned long flags;
+
+        if (rt->panic)
+                return 0;
+
+        mutex_lock(&rt->stream_mutex);
+        if (sub) {
+                /* deactivate substream */
+                spin_lock_irqsave(&sub->lock, flags);
+                sub->instance = NULL;
+                sub->active = false;
+                spin_unlock_irqrestore(&sub->lock, flags);
+
+                /* all substreams closed? if so, stop streaming */
+                if (!rt->playback.instance && !rt->capture.instance) {
+                        usb6fire_pcm_stream_stop(rt);
+                        rt->rate = -1;
+                }
+        }
+        mutex_unlock(&rt->stream_mutex);
+        return 0;
+}
+
+static int usb6fire_pcm_hw_params(struct snd_pcm_substream *alsa_sub,
+                struct snd_pcm_hw_params *hw_params)
+{
+        return snd_pcm_lib_malloc_pages(alsa_sub,
+                        params_buffer_bytes(hw_params));
+}
+
+static int usb6fire_pcm_hw_free(struct snd_pcm_substream *alsa_sub)
+{
+        return snd_pcm_lib_free_pages(alsa_sub);
+}
+
+static int usb6fire_pcm_prepare(struct snd_pcm_substream *alsa_sub)
+{
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+        struct pcm_substream *sub = usb6fire_pcm_get_substream(alsa_sub);
+        struct snd_pcm_runtime *alsa_rt = alsa_sub->runtime;
+        int i;
+        int ret;
+
+        if (rt->panic)
+                return -EPIPE;
+        if (!sub)
+                return -ENODEV;
+
+        mutex_lock(&rt->stream_mutex);
+        sub->dma_off = 0;
+        sub->period_off = 0;
+
+        if (rt->stream_state == STREAM_DISABLED) {
+                for (i = 0; i < ARRAY_SIZE(rates); i++)
+                        if (alsa_rt->rate == rates[i]) {
+                                rt->rate = i;
+                                break;
+                        }
+                if (i == ARRAY_SIZE(rates)) {
+                        mutex_unlock(&rt->stream_mutex);
+                        snd_printk("invalid rate %d in prepare.\n",
+                                        alsa_rt->rate);
+                        return -EINVAL;
+                }
+
+                ret = usb6fire_pcm_set_rate(rt);
+                if (ret) {
+                        mutex_unlock(&rt->stream_mutex);
+                        return ret;
+                }
+                ret = usb6fire_pcm_stream_start(rt);
+                if (ret) {
+                        mutex_unlock(&rt->stream_mutex);
+                        snd_printk(KERN_ERR PREFIX
+                                        "could not start pcm stream.\n");
+                        return ret;
+                }
+        }
+        mutex_unlock(&rt->stream_mutex);
+        return 0;
+}
+
+static int usb6fire_pcm_trigger(struct snd_pcm_substream *alsa_sub, int cmd)
+{
+        struct pcm_substream *sub = usb6fire_pcm_get_substream(alsa_sub);
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+        unsigned long flags;
+
+        if (rt->panic)
+                return -EPIPE;
+        if (!sub)
+                return -ENODEV;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                spin_lock_irqsave(&sub->lock, flags);
+                sub->active = true;
+                spin_unlock_irqrestore(&sub->lock, flags);
+                return 0;
+
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                spin_lock_irqsave(&sub->lock, flags);
+                sub->active = false;
+                spin_unlock_irqrestore(&sub->lock, flags);
+                return 0;
+
+        default:
+                return -EINVAL;
+        }
+}
+
+static snd_pcm_uframes_t usb6fire_pcm_pointer(
+                struct snd_pcm_substream *alsa_sub)
+{
+        struct pcm_substream *sub = usb6fire_pcm_get_substream(alsa_sub);
+        struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
+        unsigned long flags;
+        snd_pcm_uframes_t ret;
+
+        if (rt->panic || !sub)
+                return SNDRV_PCM_STATE_XRUN;
+
+        spin_lock_irqsave(&sub->lock, flags);
+        ret = sub->dma_off;
+        spin_unlock_irqrestore(&sub->lock, flags);
+        return ret;
+}
+
+static struct snd_pcm_ops pcm_ops = {
+        .open = usb6fire_pcm_open,
+        .close = usb6fire_pcm_close,
+        .ioctl = snd_pcm_lib_ioctl,
+        .hw_params = usb6fire_pcm_hw_params,
+        .hw_free = usb6fire_pcm_hw_free,
+        .prepare = usb6fire_pcm_prepare,
+        .trigger = usb6fire_pcm_trigger,
+        .pointer = usb6fire_pcm_pointer,
+};
+
+static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb,
+                struct sfire_chip *chip, bool in, int ep,
+                void (*handler)(struct urb *))
+{
+        urb->chip = chip;
+        usb_init_urb(&urb->instance);
+        urb->instance.transfer_buffer = urb->buffer;
+        urb->instance.transfer_buffer_length =
+                        PCM_N_PACKETS_PER_URB * PCM_MAX_PACKET_SIZE;
+        urb->instance.dev = chip->dev;
+        urb->instance.pipe = in ? usb_rcvisocpipe(chip->dev, ep)
+                        : usb_sndisocpipe(chip->dev, ep);
+        urb->instance.interval = 1;
+        urb->instance.transfer_flags = URB_ISO_ASAP;
+        urb->instance.complete = handler;
+        urb->instance.context = urb;
+        urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB;
+}
+
+int __devinit usb6fire_pcm_init(struct sfire_chip *chip)
+{
+        int i;
+        int ret;
+        struct snd_pcm *pcm;
+        struct pcm_runtime *rt =
+                        kzalloc(sizeof(struct pcm_runtime), GFP_KERNEL);
+
+        if (!rt)
+                return -ENOMEM;
+
+        rt->chip = chip;
+        rt->stream_state = STREAM_DISABLED;
+        rt->rate = -1;
+        init_waitqueue_head(&rt->stream_wait_queue);
+        mutex_init(&rt->stream_mutex);
+
+        spin_lock_init(&rt->playback.lock);
+        spin_lock_init(&rt->capture.lock);
+
+        for (i = 0; i < PCM_N_URBS; i++) {
+                usb6fire_pcm_init_urb(&rt->in_urbs[i], chip, true, IN_EP,
+                                usb6fire_pcm_in_urb_handler);
+                usb6fire_pcm_init_urb(&rt->out_urbs[i], chip, false, OUT_EP,
+                                usb6fire_pcm_out_urb_handler);
+
+                rt->in_urbs[i].peer = &rt->out_urbs[i];
+                rt->out_urbs[i].peer = &rt->in_urbs[i];
+        }
+
+        ret = snd_pcm_new(chip->card, "DMX6FireUSB", 0, 1, 1, &pcm);
+        if (ret < 0) {
+                kfree(rt);
+                snd_printk(KERN_ERR PREFIX "cannot create pcm instance.\n");
+                return ret;
+        }
+
+        pcm->private_data = rt;
+        strcpy(pcm->name, "DMX 6Fire USB");
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &pcm_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_ops);
+
+        ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
+                        SNDRV_DMA_TYPE_CONTINUOUS,
+                        snd_dma_continuous_data(GFP_KERNEL),
+                        MAX_BUFSIZE, MAX_BUFSIZE);
+        if (ret) {
+                kfree(rt);
+                snd_printk(KERN_ERR PREFIX
+                                "error preallocating pcm buffers.\n");
+                return ret;
+        }
+        rt->instance = pcm;
+
+        chip->pcm = rt;
+        return 0;
+}
+
+void usb6fire_pcm_abort(struct sfire_chip *chip)
+{
+        struct pcm_runtime *rt = chip->pcm;
+        int i;
+
+        if (rt) {
+                rt->panic = true;
+
+                if (rt->playback.instance)
+                        snd_pcm_stop(rt->playback.instance,
+                                        SNDRV_PCM_STATE_XRUN);
+                if (rt->capture.instance)
+                        snd_pcm_stop(rt->capture.instance,
+                                        SNDRV_PCM_STATE_XRUN);
+
+                for (i = 0; i < PCM_N_URBS; i++) {
+                        usb_poison_urb(&rt->in_urbs[i].instance);
+                        usb_poison_urb(&rt->out_urbs[i].instance);
+                }
+
+        }
+}
+
+void usb6fire_pcm_destroy(struct sfire_chip *chip)
+{
+        kfree(chip->pcm);
+        chip->pcm = NULL;
+}
diff --git a/sound/usb/6fire/pcm.h b/sound/usb/6fire/pcm.h
new file mode 100644
index 000000000000..2bee81374002
--- /dev/null
+++ b/sound/usb/6fire/pcm.h
@@ -0,0 +1,76 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_PCM_H
+#define USB6FIRE_PCM_H
+
+#include <sound/pcm.h>
+#include <linux/mutex.h>
+
+#include "common.h"
+
+enum /* settings for pcm */
+{
+        /* maximum of EP_W_MAX_PACKET_SIZE[] (see firmware.c) */
+        PCM_N_URBS = 16, PCM_N_PACKETS_PER_URB = 8, PCM_MAX_PACKET_SIZE = 604
+};
+
+struct pcm_urb {
+        struct sfire_chip *chip;
+
+        /* BEGIN DO NOT SEPARATE */
+        struct urb instance;
+        struct usb_iso_packet_descriptor packets[PCM_N_PACKETS_PER_URB];
+        /* END DO NOT SEPARATE */
+        u8 buffer[PCM_N_PACKETS_PER_URB * PCM_MAX_PACKET_SIZE];
+
+        struct pcm_urb *peer;
+};
+
+struct pcm_substream {
+        spinlock_t lock;
+        struct snd_pcm_substream *instance;
+
+        bool active;
+
+        snd_pcm_uframes_t dma_off; /* current position in alsa dma_area */
+        snd_pcm_uframes_t period_off; /* current position in current period */
+};
+
+struct pcm_runtime {
+        struct sfire_chip *chip;
+        struct snd_pcm *instance;
+
+        struct pcm_substream playback;
+        struct pcm_substream capture;
+        bool panic; /* if set driver won't do anymore pcm on device */
+
+        struct pcm_urb in_urbs[PCM_N_URBS];
+        struct pcm_urb out_urbs[PCM_N_URBS];
+        int in_packet_size;
+        int out_packet_size;
+        int in_n_analog; /* number of analog channels soundcard sends */
+        int out_n_analog; /* number of analog channels soundcard receives */
+
+        struct mutex stream_mutex;
+        u8 stream_state; /* one of STREAM_XXX (pcm.c) */
+        u8 rate; /* one of PCM_RATE_XXX */
+        wait_queue_head_t stream_wait_queue;
+        bool stream_wait_cond;
+};
+
+int __devinit usb6fire_pcm_init(struct sfire_chip *chip);
+void usb6fire_pcm_abort(struct sfire_chip *chip);
+void usb6fire_pcm_destroy(struct sfire_chip *chip);
+#endif /* USB6FIRE_PCM_H */
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 112984f4080f..97724d8fa9f6 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -62,6 +62,7 @@ config SND_USB_CAIAQ
             * Native Instruments Audio 2 DJ
             * Native Instruments Audio 4 DJ
             * Native Instruments Audio 8 DJ
+            * Native Instruments Traktor Audio 2
             * Native Instruments Guitar Rig Session I/O
             * Native Instruments Guitar Rig mobile
             * Native Instruments Traktor Kontrol X1
@@ -97,5 +98,21 @@ config SND_USB_US122L
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-us122l.
 
+config SND_USB_6FIRE
+        tristate "TerraTec DMX 6Fire USB"
+        depends on EXPERIMENTAL
+        select FW_LOADER
+        select SND_RAWMIDI
+        select SND_PCM
+        help
+          Say Y here to include support for TerraTec 6fire DMX USB interface.
+
+          You will need firmware files in order to be able to use the device
+          after it has been coldstarted. This driver currently does not support
+          firmware loading for all devices. If you own such a device,
+          you could start windows and let the windows driver upload
+          the firmware. As long as you do not unplug your device from power,
+          it should be usable.
+
 endif   # SND_USB
 
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 1e362bf8834f..cf9ed66445fa 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -23,4 +23,4 @@ obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o
 obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o
 obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o
 
-obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/
+obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ 6fire/
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index 66eabafb1c24..d0d493ca28ae 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -805,6 +805,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORAUDIO2):
                 dev->samplerates |= SNDRV_PCM_RATE_88200;
                 break;
         }
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 6480c3283c05..45bc4a2dc6f0 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -46,6 +46,7 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
                          "{Native Instruments, Audio 2 DJ},"
                          "{Native Instruments, Audio 4 DJ},"
                          "{Native Instruments, Audio 8 DJ},"
+                         "{Native Instruments, Traktor Audio 2},"
                          "{Native Instruments, Session I/O},"
                          "{Native Instruments, GuitarRig mobile}"
                          "{Native Instruments, Traktor Kontrol X1}"
@@ -140,6 +141,11 @@ static struct usb_device_id snd_usb_id_table[] = {
                 .idVendor =     USB_VID_NATIVEINSTRUMENTS,
                 .idProduct =    USB_PID_TRAKTORKONTROLS4
         },
+        {
+                .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+                .idVendor =     USB_VID_NATIVEINSTRUMENTS,
+                .idProduct =    USB_PID_TRAKTORAUDIO2
+        },
         { /* terminator */ }
 };
 
diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h
index e3d8a3efb35b..b2b310194ffa 100644
--- a/sound/usb/caiaq/device.h
+++ b/sound/usb/caiaq/device.h
@@ -17,6 +17,7 @@
 #define USB_PID_GUITARRIGMOBILE         0x0d8d
 #define USB_PID_TRAKTORKONTROLX1        0x2305
 #define USB_PID_TRAKTORKONTROLS4        0xbaff
+#define USB_PID_TRAKTORAUDIO2           0x041d
 
 #define EP1_BUFSIZE 64
 #define EP4_BUFSIZE 512
diff --git a/sound/usb/card.c b/sound/usb/card.c
index c0f8270bc199..40722f8711ad 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -65,6 +65,7 @@
 #include "pcm.h"
 #include "urb.h"
 #include "format.h"
+#include "power.h"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -330,6 +331,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
         chip->setup = device_setup[idx];
         chip->nrpacks = nrpacks;
         chip->async_unlink = async_unlink;
+        chip->probing = 1;
 
         chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
                               le16_to_cpu(dev->descriptor.idProduct));
@@ -451,6 +453,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
                                 goto __error;
                         }
                         chip = usb_chip[i];
+                        chip->probing = 1;
                         break;
                 }
         }
@@ -466,6 +469,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
                                         goto __error;
                                 }
                                 snd_card_set_dev(chip->card, &intf->dev);
+                                chip->pm_intf = intf;
                                 break;
                         }
                 if (!chip) {
@@ -505,6 +509,7 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
 
         usb_chip[chip->index] = chip;
         chip->num_interfaces++;
+        chip->probing = 0;
         mutex_unlock(&register_mutex);
         return chip;
 
@@ -581,29 +586,61 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 }
 
 #ifdef CONFIG_PM
+
+int snd_usb_autoresume(struct snd_usb_audio *chip)
+{
+        int err = -ENODEV;
+
+        if (!chip->shutdown && !chip->probing)
+                err = usb_autopm_get_interface(chip->pm_intf);
+
+        return err;
+}
+
+void snd_usb_autosuspend(struct snd_usb_audio *chip)
+{
+        if (!chip->shutdown && !chip->probing)
+                usb_autopm_put_interface(chip->pm_intf);
+}
+
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct snd_usb_audio *chip = usb_get_intfdata(intf);
         struct list_head *p;
         struct snd_usb_stream *as;
+        struct usb_mixer_interface *mixer;
 
         if (chip == (void *)-1L)
                 return 0;
 
-        snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
-        if (!chip->num_suspended_intf++) {
-                list_for_each(p, &chip->pcm_list) {
-                        as = list_entry(p, struct snd_usb_stream, list);
-                        snd_pcm_suspend_all(as->pcm);
-                }
+        if (!(message.event & PM_EVENT_AUTO)) {
+                snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
+                if (!chip->num_suspended_intf++) {
+                        list_for_each(p, &chip->pcm_list) {
+                                as = list_entry(p, struct snd_usb_stream, list);
+                                snd_pcm_suspend_all(as->pcm);
+                        }
+                }
+        } else {
+                /*
+                 * otherwise we keep the rest of the system in the dark
+                 * to keep this transparent
+                 */
+                if (!chip->num_suspended_intf++)
+                        chip->autosuspended = 1;
         }
 
+        list_for_each_entry(mixer, &chip->mixer_list, list)
+                snd_usb_mixer_inactivate(mixer);
+
         return 0;
 }
 
 static int usb_audio_resume(struct usb_interface *intf)
 {
         struct snd_usb_audio *chip = usb_get_intfdata(intf);
+        struct usb_mixer_interface *mixer;
+        int err = 0;
 
         if (chip == (void *)-1L)
                 return 0;
@@ -611,12 +648,20 @@ static int usb_audio_resume(struct usb_interface *intf)
                 return 0;
         /*
          * ALSA leaves material resumption to user space
-         * we just notify
+         * we just notify and restart the mixers
          */
+        list_for_each_entry(mixer, &chip->mixer_list, list) {
+                err = snd_usb_mixer_activate(mixer);
+                if (err < 0)
+                        goto err_out;
+        }
 
-        snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
+        if (!chip->autosuspended)
+                snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
+        chip->autosuspended = 0;
 
-        return 0;
+err_out:
+        return err;
 }
 #else
 #define usb_audio_suspend       NULL
@@ -644,6 +689,7 @@ static struct usb_driver usb_audio_driver = {
         .suspend =      usb_audio_suspend,
         .resume =       usb_audio_resume,
         .id_table =     usb_audio_ids,
+        .supports_autosuspend = 1,
 };
 
 static int __init snd_usb_audio_init(void)
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index db2dc5ffe6dd..b4b39c0b6c9e 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -54,6 +54,7 @@
 #include <sound/asequencer.h>
 #include "usbaudio.h"
 #include "midi.h"
+#include "power.h"
 #include "helper.h"
 
 /*
@@ -1044,6 +1045,7 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
         struct snd_usb_midi* umidi = substream->rmidi->private_data;
         struct usbmidi_out_port* port = NULL;
         int i, j;
+        int err;
 
         for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
                 if (umidi->endpoints[i].out)
@@ -1056,6 +1058,9 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
                 snd_BUG();
                 return -ENXIO;
         }
+        err = usb_autopm_get_interface(umidi->iface);
+        if (err < 0)
+                return -EIO;
         substream->runtime->private_data = port;
         port->state = STATE_UNKNOWN;
         substream_open(substream, 1);
@@ -1064,7 +1069,10 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
 
 static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
 {
+        struct snd_usb_midi* umidi = substream->rmidi->private_data;
+
         substream_open(substream, 0);
+        usb_autopm_put_interface(umidi->iface);
         return 0;
 }
 
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 85af6051b52d..5e4775716607 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -61,6 +61,7 @@
 #include "mixer.h"
 #include "helper.h"
 #include "mixer_quirks.h"
+#include "power.h"
 
 #define MAX_ID_ELEMS    256
 
@@ -295,16 +296,22 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
         unsigned char buf[2];
         int val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
         int timeout = 10;
+        int err;
 
+        err = snd_usb_autoresume(cval->mixer->chip);
+        if (err < 0)
+                return -EIO;
         while (timeout-- > 0) {
                 if (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                                     validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
                                     buf, val_len, 100) >= val_len) {
                         *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
+                        snd_usb_autosuspend(cval->mixer->chip);
                         return 0;
                 }
         }
+        snd_usb_autosuspend(cval->mixer->chip);
         snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
                     request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type);
         return -EINVAL;
@@ -328,12 +335,18 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
 
         memset(buf, 0, sizeof(buf));
 
+        ret = snd_usb_autoresume(chip) ? -EIO : 0;
+        if (ret)
+                goto error;
+
         ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
                               USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                               validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
                               buf, size, 1000);
+        snd_usb_autosuspend(chip);
 
         if (ret < 0) {
+error:
                 snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
                            request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type);
                 return ret;
@@ -413,7 +426,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
 {
         struct snd_usb_audio *chip = cval->mixer->chip;
         unsigned char buf[2];
-        int val_len, timeout = 10;
+        int val_len, err, timeout = 10;
 
         if (cval->mixer->protocol == UAC_VERSION_1) {
                 val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
@@ -433,13 +446,19 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
         value_set = convert_bytes_value(cval, value_set);
         buf[0] = value_set & 0xff;
         buf[1] = (value_set >> 8) & 0xff;
+        err = snd_usb_autoresume(chip);
+        if (err < 0)
+                return -EIO;
         while (timeout-- > 0)
                 if (snd_usb_ctl_msg(chip->dev,
                                     usb_sndctrlpipe(chip->dev, 0), request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
                                     validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-                                    buf, val_len, 100) >= 0)
+                                    buf, val_len, 100) >= 0) {
+                        snd_usb_autosuspend(chip);
                         return 0;
+                }
+        snd_usb_autosuspend(chip);
         snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
                     request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type, buf[0], buf[1]);
         return -EINVAL;
@@ -987,6 +1006,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
         struct snd_kcontrol *kctl;
         struct usb_mixer_elem_info *cval;
         const struct usbmix_name_map *map;
+        unsigned int range;
 
         control++; /* change from zero-based to 1-based value */
 
@@ -1121,6 +1141,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 }
                 break;
 
+        case USB_ID(0x046d, 0x0808):
         case USB_ID(0x046d, 0x0809):
         case USB_ID(0x046d, 0x0991):
         /* Most audio usb devices lie about volume resolution.
@@ -1136,6 +1157,21 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
 
         }
 
+        range = (cval->max - cval->min) / cval->res;
+        /* Are there devices with volume range more than 255? I use a bit more
+         * to be sure. 384 is a resolution magic number found on Logitech
+         * devices. It will definitively catch all buggy Logitech devices.
+         */
+        if (range > 384) {
+                snd_printk(KERN_WARNING "usb_audio: Warning! Unlikely big "
+                           "volume range (=%u), cval->res is probably wrong.",
+                           range);
+                snd_printk(KERN_WARNING "usb_audio: [%d] FU [%s] ch = %d, "
+                           "val = %d/%d/%d", cval->id,
+                           kctl->id.name, cval->channels,
+                           cval->min, cval->max, cval->res);
+        }
+
         snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
                     cval->id, kctl->id.name, cval->channels, cval->min, cval->max, cval->res);
         add_control_to_empty(state, kctl);
@@ -2058,8 +2094,9 @@ static void snd_usb_mixer_interrupt(struct urb *urb)
 {
         struct usb_mixer_interface *mixer = urb->context;
         int len = urb->actual_length;
+        int ustatus = urb->status;
 
-        if (urb->status != 0)
+        if (ustatus != 0)
                 goto requeue;
 
         if (mixer->protocol == UAC_VERSION_1) {
@@ -2100,12 +2137,32 @@ static void snd_usb_mixer_interrupt(struct urb *urb)
         }
 
 requeue:
-        if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
+        if (ustatus != -ENOENT && ustatus != -ECONNRESET && ustatus != -ESHUTDOWN) {
                 urb->dev = mixer->chip->dev;
                 usb_submit_urb(urb, GFP_ATOMIC);
         }
 }
 
+/* stop any bus activity of a mixer */
+void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer)
+{
+        usb_kill_urb(mixer->urb);
+        usb_kill_urb(mixer->rc_urb);
+}
+
+int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
+{
+        int err;
+
+        if (mixer->urb) {
+                err = usb_submit_urb(mixer->urb, GFP_NOIO);
+                if (err < 0)
+                        return err;
+        }
+
+        return 0;
+}
+
 /* create the handler for the optional status interrupt endpoint */
 static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer)
 {
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 26c636c5c93a..b4a2c8165e4b 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -52,5 +52,7 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);
 
 int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
                                 int request, int validx, int value_set);
+void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer);
+int snd_usb_mixer_activate(struct usb_mixer_interface *mixer);
 
 #endif /* __USBMIXER_H */
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 782f741cd00a..73dcc8256bc0 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -346,6 +346,141 @@ static int snd_xonar_u1_controls_create(struct usb_mixer_interface *mixer)
         return 0;
 }
 
+/* Native Instruments device quirks */
+
+#define _MAKE_NI_CONTROL(bRequest,wIndex) ((bRequest) << 16 | (wIndex))
+
+static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+        struct usb_device *dev = mixer->chip->dev;
+        u8 bRequest = (kcontrol->private_value >> 16) & 0xff;
+        u16 wIndex = kcontrol->private_value & 0xffff;
+        u8 tmp;
+
+        int ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
+                                  USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
+                                  0, cpu_to_le16(wIndex),
+                                  &tmp, sizeof(tmp), 1000);
+
+        if (ret < 0) {
+                snd_printk(KERN_ERR
+                           "unable to issue vendor read request (ret = %d)", ret);
+                return ret;
+        }
+
+        ucontrol->value.integer.value[0] = tmp;
+
+        return 0;
+}
+
+static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,
+                                             struct snd_ctl_elem_value *ucontrol)
+{
+        struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+        struct usb_device *dev = mixer->chip->dev;
+        u8 bRequest = (kcontrol->private_value >> 16) & 0xff;
+        u16 wIndex = kcontrol->private_value & 0xffff;
+        u16 wValue = ucontrol->value.integer.value[0];
+
+        int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest,
+                                  USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+                                  cpu_to_le16(wValue), cpu_to_le16(wIndex),
+                                  NULL, 0, 1000);
+
+        if (ret < 0) {
+                snd_printk(KERN_ERR
+                           "unable to issue vendor write request (ret = %d)", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = {
+        {
+                .name = "Direct Thru Channel A",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x03),
+        },
+        {
+                .name = "Direct Thru Channel B",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x05),
+        },
+        {
+                .name = "Phono Input Channel A",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x03),
+        },
+        {
+                .name = "Phono Input Channel B",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x05),
+        },
+};
+
+static struct snd_kcontrol_new snd_nativeinstruments_ta10_mixers[] = {
+        {
+                .name = "Direct Thru Channel A",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x03),
+        },
+        {
+                .name = "Direct Thru Channel B",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x05),
+        },
+        {
+                .name = "Direct Thru Channel C",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x07),
+        },
+        {
+                .name = "Direct Thru Channel D",
+                .private_value = _MAKE_NI_CONTROL(0x01, 0x09),
+        },
+        {
+                .name = "Phono Input Channel A",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x03),
+        },
+        {
+                .name = "Phono Input Channel B",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x05),
+        },
+        {
+                .name = "Phono Input Channel C",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x07),
+        },
+        {
+                .name = "Phono Input Channel D",
+                .private_value = _MAKE_NI_CONTROL(0x02, 0x09),
+        },
+};
+
+static int snd_nativeinstruments_create_mixer(struct usb_mixer_interface *mixer,
+                                              const struct snd_kcontrol_new *kc,
+                                              unsigned int count)
+{
+        int i, err = 0;
+        struct snd_kcontrol_new template = {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+                .get = snd_nativeinstruments_control_get,
+                .put = snd_nativeinstruments_control_put,
+                .info = snd_ctl_boolean_mono_info,
+        };
+
+        for (i = 0; i < count; i++) {
+                struct snd_kcontrol *c;
+
+                template.name = kc[i].name;
+                template.private_value = kc[i].private_value;
+
+                c = snd_ctl_new1(&template, mixer);
+                err = snd_ctl_add(mixer->chip->card, c);
+
+                if (err < 0)
+                        break;
+        }
+
+        return err;
+}
+
 void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
                                unsigned char samplerate_id)
 {
@@ -367,31 +502,44 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
 
 int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
 {
-        int err;
+        int err = 0;
         struct snd_info_entry *entry;
 
         if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0)
                 return err;
 
-        if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020) ||
-            mixer->chip->usb_id == USB_ID(0x041e, 0x3040) ||
-            mixer->chip->usb_id == USB_ID(0x041e, 0x3042) ||
-            mixer->chip->usb_id == USB_ID(0x041e, 0x3048)) {
-                if ((err = snd_audigy2nx_controls_create(mixer)) < 0)
-                        return err;
+        switch (mixer->chip->usb_id) {
+        case USB_ID(0x041e, 0x3020):
+        case USB_ID(0x041e, 0x3040):
+        case USB_ID(0x041e, 0x3042):
+        case USB_ID(0x041e, 0x3048):
+                err = snd_audigy2nx_controls_create(mixer);
+                if (err < 0)
+                        break;
                 if (!snd_card_proc_new(mixer->chip->card, "audigy2nx", &entry))
                         snd_info_set_text_ops(entry, mixer,
                                               snd_audigy2nx_proc_read);
-        }
+                break;
 
-        if (mixer->chip->usb_id == USB_ID(0x0b05, 0x1739) ||
-            mixer->chip->usb_id == USB_ID(0x0b05, 0x1743)) {
+        case USB_ID(0x0b05, 0x1739):
+        case USB_ID(0x0b05, 0x1743):
                 err = snd_xonar_u1_controls_create(mixer);
-                if (err < 0)
-                        return err;
+                break;
+
+        case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */
+                err = snd_nativeinstruments_create_mixer(mixer,
+                                snd_nativeinstruments_ta6_mixers,
+                                ARRAY_SIZE(snd_nativeinstruments_ta6_mixers));
+                break;
+
+        case USB_ID(0x17cc, 0x1021): /* Traktor Audio 10 */
+                err = snd_nativeinstruments_create_mixer(mixer,
+                                snd_nativeinstruments_ta10_mixers,
+                                ARRAY_SIZE(snd_nativeinstruments_ta10_mixers));
+                break;
         }
 
-        return 0;
+        return err;
 }
 
 void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer,
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index e3f680526cb5..b8dcbf407bbb 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -32,6 +32,7 @@
 #include "helper.h"
 #include "pcm.h"
 #include "clock.h"
+#include "power.h"
 
 /*
  * return the current pcm pointer.  just based on the hwptr_done value.
@@ -739,6 +740,9 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
                 pt = 125 * (1 << fp->datainterval);
                 ptmin = min(ptmin, pt);
         }
+        err = snd_usb_autoresume(subs->stream->chip);
+        if (err < 0)
+                return err;
 
         param_period_time_if_needed = SNDRV_PCM_HW_PARAM_PERIOD_TIME;
         if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
@@ -756,21 +760,21 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
                                        SNDRV_PCM_HW_PARAM_CHANNELS,
                                        param_period_time_if_needed,
                                        -1)) < 0)
-                return err;
+                goto rep_err;
         if ((err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
                                        hw_rule_channels, subs,
                                        SNDRV_PCM_HW_PARAM_FORMAT,
                                        SNDRV_PCM_HW_PARAM_RATE,
                                        param_period_time_if_needed,
                                        -1)) < 0)
-                return err;
+                goto rep_err;
         if ((err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT,
                                        hw_rule_format, subs,
                                        SNDRV_PCM_HW_PARAM_RATE,
                                        SNDRV_PCM_HW_PARAM_CHANNELS,
                                        param_period_time_if_needed,
                                        -1)) < 0)
-                return err;
+                goto rep_err;
         if (param_period_time_if_needed >= 0) {
                 err = snd_pcm_hw_rule_add(runtime, 0,
                                           SNDRV_PCM_HW_PARAM_PERIOD_TIME,
@@ -780,11 +784,15 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
                                           SNDRV_PCM_HW_PARAM_RATE,
                                           -1);
                 if (err < 0)
-                        return err;
+                        goto rep_err;
         }
         if ((err = snd_usb_pcm_check_knot(runtime, subs)) < 0)
-                return err;
+                goto rep_err;
         return 0;
+
+rep_err:
+        snd_usb_autosuspend(subs->stream->chip);
+        return err;
 }
 
 static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
@@ -798,6 +806,7 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
         runtime->hw = snd_usb_hardware;
         runtime->private_data = subs;
         subs->pcm_substream = substream;
+        /* runtime PM is also done there */
         return setup_hw_info(runtime, subs);
 }
 
@@ -811,6 +820,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
                 subs->interface = -1;
         }
         subs->pcm_substream = NULL;
+        snd_usb_autosuspend(subs->stream->chip);
         return 0;
 }
 
diff --git a/sound/usb/power.h b/sound/usb/power.h
new file mode 100644
index 000000000000..48ee51dcb71e
--- /dev/null
+++ b/sound/usb/power.h
@@ -0,0 +1,17 @@
+#ifndef __USBAUDIO_POWER_H
+#define __USBAUDIO_POWER_H
+
+#ifdef CONFIG_PM
+int snd_usb_autoresume(struct snd_usb_audio *chip);
+void snd_usb_autosuspend(struct snd_usb_audio *chip);
+#else
+static inline int snd_usb_autoresume(struct snd_usb_audio *chip)
+{
+        return 0;
+}
+static inline void snd_usb_autosuspend(struct snd_usb_audio *chip)
+{
+}
+#endif
+
+#endif /* __USBAUDIO_POWER_H */
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 921a86fd9884..c0dcfca9b5b5 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2290,6 +2290,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* Native Instruments MK2 series */
+{
+        /* Traktor Audio 6 */
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x17cc,
+        .idProduct = 0x1010,
+},
+{
+        /* Traktor Audio 10 */
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x17cc,
+        .idProduct = 0x1020,
+},
+
 /* Miditech devices */
 {
         USB_DEVICE(0x4752, 0x0011),
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index e314cdb85003..355759bad581 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -425,6 +425,34 @@ static int snd_usb_accessmusic_boot_quirk(struct usb_device *dev)
 }
 
 /*
+ * Some sound cards from Native Instruments are in fact compliant to the USB
+ * audio standard of version 2 and other approved USB standards, even though
+ * they come up as vendor-specific device when first connected.
+ *
+ * However, they can be told to come up with a new set of descriptors
+ * upon their next enumeration, and the interfaces announced by the new
+ * descriptors will then be handled by the kernel's class drivers. As the
+ * product ID will also change, no further checks are required.
+ */
+
+static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
+{
+        int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                                  0xaf, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                                  cpu_to_le16(1), 0, NULL, 0, 1000);
+
+        if (ret < 0)
+                return ret;
+
+        usb_reset_device(dev);
+
+        /* return -EAGAIN, so the creation of an audio interface for this
+         * temporary device is aborted. The device will reconnect with a
+         * new product ID */
+        return -EAGAIN;
+}
+
+/*
  * Setup quirks
  */
 #define AUDIOPHILE_SET                  0x01 /* if set, parse device_setup */
@@ -489,27 +517,33 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
         u32 id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
                         le16_to_cpu(dev->descriptor.idProduct));
 
-        /* SB Extigy needs special boot-up sequence */
-        /* if more models come, this will go to the quirk list. */
-        if (id == USB_ID(0x041e, 0x3000))
+        switch (id) {
+        case USB_ID(0x041e, 0x3000):
+                /* SB Extigy needs special boot-up sequence */
+                /* if more models come, this will go to the quirk list. */
                 return snd_usb_extigy_boot_quirk(dev, intf);
 
-        /* SB Audigy 2 NX needs its own boot-up magic, too */
-        if (id == USB_ID(0x041e, 0x3020))
+        case USB_ID(0x041e, 0x3020):
+                /* SB Audigy 2 NX needs its own boot-up magic, too */
                 return snd_usb_audigy2nx_boot_quirk(dev);
 
-        /* C-Media CM106 / Turtle Beach Audio Advantage Roadie */
-        if (id == USB_ID(0x10f5, 0x0200))
+        case USB_ID(0x10f5, 0x0200):
+                /* C-Media CM106 / Turtle Beach Audio Advantage Roadie */
                 return snd_usb_cm106_boot_quirk(dev);
 
-        /* C-Media CM6206 / CM106-Like Sound Device */
-        if (id == USB_ID(0x0d8c, 0x0102))
+        case USB_ID(0x0d8c, 0x0102):
+                /* C-Media CM6206 / CM106-Like Sound Device */
                 return snd_usb_cm6206_boot_quirk(dev);
 
-        /* Access Music VirusTI Desktop */
-        if (id == USB_ID(0x133e, 0x0815))
+        case USB_ID(0x133e, 0x0815):
+                /* Access Music VirusTI Desktop */
                 return snd_usb_accessmusic_boot_quirk(dev);
 
+        case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */
+        case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */
+                return snd_usb_nativeinstruments_boot_quirk(dev);
+        }
+
         return 0;
 }
 
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 6e66fffe87f5..32f2a97f2f14 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -34,10 +34,14 @@ struct snd_usb_audio {
         int index;
         struct usb_device *dev;
         struct snd_card *card;
+        struct usb_interface *pm_intf;
         u32 usb_id;
-        int shutdown;
         struct mutex shutdown_mutex;
+        unsigned int shutdown:1;
+        unsigned int probing:1;
+        unsigned int autosuspended:1;   
         unsigned int txfr_quirk:1; /* Subframe boundaries on transfers */
+        
         int num_interfaces;
         int num_suspended_intf;