ALSA: asihpi - Replace adapter list with single item in subsys response.
authorEliot Blennerhassett <eblennerhassett@audioscience.com>
Thu, 10 Feb 2011 04:26:09 +0000 (17:26 +1300)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Feb 2011 17:49:31 +0000 (18:49 +0100)
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/asihpi/hpi6000.c
sound/pci/asihpi/hpi6205.c
sound/pci/asihpi/hpi_internal.h
sound/pci/asihpi/hpicmn.c
sound/pci/asihpi/hpifunc.c
sound/pci/asihpi/hpioctl.c

index 9a05672..3e3c2ef 100644 (file)
@@ -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;
 }
 
index eefe459..971c593 100644 (file)
@@ -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;
 }
 
index 9f003a4..10de7e0 100644 (file)
@@ -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 {
index 4d696ab..e0a08f6 100644 (file)
@@ -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;
        }
 }
index 28e98dd..53924e4 100644 (file)
@@ -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;
 }
 
index 4bd3278..0ea9aae 100644 (file)
@@ -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);