ALSA: asihpi - Replace adapter list with single item in subsys response.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 9a05672e2302359b1a0157b9fd42980f174458db..3e3c2ef6efd855f8efc132c3a407c5d46bfe2489 100644 (file)
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -458,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;
 }
 

diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index eefe459ac16062dfd2e098c5123c22aff71a9a51..971c59313d753635a771427b64c7f94ed9642af4 100644 (file)
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -488,9 +488,8 @@ static void subsys_create_adapter(struct hpi_message *phm,
                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;
 }
 

diff --git a/sound/pci/asihpi/hpi_internal.h b/sound/pci/asihpi/hpi_internal.h
index 9f003a47fd7a8ae11b07b8057f604fa6bec00c7c..10de7e0aff145ef3685b49206004d6071385a532 100644 (file)
--- a/sound/pci/asihpi/hpi_internal.h
+++ b/sound/pci/asihpi/hpi_internal.h
@@ -626,10 +626,11 @@ 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];
+       u16 adapter_type;
+       u16 pad16;
 };
 
 union hpi_adapterx_msg {

diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index 4d696ab4b1f068d9fcfaf3f0bff59939e8ab956f..e0a08f61a34870209050bc7a38f448f7a00adadb 100644 (file)
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -164,11 +164,10 @@ static void subsys_get_adapter(struct hpi_message *phm,
 
        if (index < HPI_MAX_ADAPTERS) {
                phr->u.s.adapter_index = adapters.adapter[index].index;
-               phr->u.s.aw_adapter_list[0] =
-                       adapters.adapter[index].adapter_type;
+               phr->u.s.adapter_type = adapters.adapter[index].adapter_type;
        } else {
                phr->u.s.adapter_index = 0;
-               phr->u.s.aw_adapter_list[0] = 0;
+               phr->u.s.adapter_type = 0;
                phr->error = HPI_ERROR_BAD_ADAPTER_NUMBER;
        }
 }

diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c
index 28e98dd9249bbf472bf2cd4bd14e196d6ea50ca3..53924e4941618110de38e8d4d5a9231ed095e645 100644 (file)
--- a/sound/pci/asihpi/hpifunc.c
+++ b/sound/pci/asihpi/hpifunc.c
@@ -153,7 +153,8 @@ u16 hpi_subsys_get_adapter(int iterator, u32 *padapter_index,
        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];
+       *pw_adapter_type = hr.u.s.adapter_type;
+
        return hr.error;
 }
 

diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c
index 4bd32782ad9d6e85d0201488e7c222db11f9bc86..0ea9aae8011b4573743108cff4158798a0e7907d 100644 (file)
--- a/sound/pci/asihpi/hpioctl.c
+++ b/sound/pci/asihpi/hpioctl.c
@@ -389,7 +389,7 @@ 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(adapter.index);