[PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[Ian Dawes]

Signed-off-by: Ian Dawes <madeallup.gen@gmail.com>

diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 64b9fda..df99ec9 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -52,6 +52,7 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
 	{ OXYGEN_PCI_SUBID(0x1043, 0x835d) },
 	{ OXYGEN_PCI_SUBID(0x1043, 0x835e) },
 	{ OXYGEN_PCI_SUBID(0x1043, 0x838e) },
+	{ OXYGEN_PCI_SUBID(0x1043, 0x8428) },
 	{ OXYGEN_PCI_SUBID(0x1043, 0x8522) },
 	{ OXYGEN_PCI_SUBID_BROKEN_EEPROM },
 	{ }
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index c8c7f2c..2567810 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -499,6 +499,17 @@ static void xonar_stx_init(struct oxygen *chip)
 	xonar_st_init_common(chip);
 }
 
+static void xonar_xense_init(struct oxygen *chip)
+{
+	struct xonar_pcm179x *data = chip->model_data;
+
+	data->generic.ext_power_reg = OXYGEN_GPI_DATA;
+	data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
+	data->generic.ext_power_bit = GPI_EXT_POWER;
+	xonar_init_ext_power(chip);
+	xonar_st_init(chip);
+}
+
 static void xonar_d2_cleanup(struct oxygen *chip)
 {
 	xonar_disable_output(chip);
@@ -1138,6 +1149,14 @@ int get_xonar_pcm179x_model(struct oxygen *chip,
 		chip->model.resume = xonar_stx_resume;
 		chip->model.set_dac_params = set_pcm1796_params;
 		break;
+	case 0x8428:
+		chip->model = model_xonar_st;
+		chip->model.shortname = "Xonar Xense";
+		chip->model.chip = "AV100";
+		chip->model.init = xonar_xense_init;
+		chip->model.dac_channels_pcm = 8;
+		chip->model.dac_channels_mixer = 8;
+		break;
 	default:
 		return -EINVAL;
 	}
-- 
1.8.1.2

Re: [PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[Clemens Ladisch]

Ian Dawes wrote:
>
> Signed-off-by: Ian Dawes <madeallup.gen@gmail.com>

The commit message was squashed into the subject line.  There's probably
an empty line missing between them.

> +++ b/sound/pci/oxygen/xonar_pcm179x.c
> +static void xonar_xense_init(struct oxygen *chip)
> +{
> +	struct xonar_pcm179x *data = chip->model_data;
> +
> +	data->generic.ext_power_reg = OXYGEN_GPI_DATA;
> +	data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
> +	data->generic.ext_power_bit = GPI_EXT_POWER;
> +	xonar_init_ext_power(chip);
> +	xonar_st_init(chip);
> +}

How much of this is guesswork?  :-)

Shouldn't you rather use xonar_stx_init(), which does not try to
configure the nonexistent CS2000 chip?

> +	case 0x8428:
> +		chip->model = model_xonar_st;
> +		chip->model.shortname = "Xonar Xense";
> +		chip->model.chip = "AV100";
> +		chip->model.init = xonar_xense_init;
> +		chip->model.dac_channels_pcm = 8;
> +		chip->model.dac_channels_mixer = 8;

When only two channels work, why declaring more?


Regards,
Clemens

Re: [PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[Clemens Ladisch]

Ian Dawes wrote:
> Clemens Ladisch <clemens@ladisch.de> wrote:
>> Ian Dawes wrote:
>>> Clemens Ladisch <clemens@ladisch.de> wrote:
>>>> Ian Dawes wrote:
>>>>>
>>>>> Signed-off-by: Ian Dawes <madeallup.gen@gmail.com>
>>>>
>>>> The commit message was squashed into the subject line.  There's
>>>> probably an empty line missing between them.
>>>
>>> I'm not sure what this means.
>>
>> Did you intend for the subject to be this long?
>
> Probably not. I added "resubmitted" to the subject

And the "Added support ..." was supposed to be in the subject, too?

> How should I rectify this?

Ensure there is an empty line after the subject.


Regards,
Clemens

Re: [PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[Ian Dawes]

On 30/07/13 07:36, Clemens Ladisch wrote:
> Ian Dawes wrote:
>> Clemens Ladisch <clemens@ladisch.de> wrote:
>>> Ian Dawes wrote:
>>>> Clemens Ladisch <clemens@ladisch.de> wrote:
>>>>> Ian Dawes wrote:
>>>>>> Signed-off-by: Ian Dawes <madeallup.gen@gmail.com>
>>>>> The commit message was squashed into the subject line.  There's
>>>>> probably an empty line missing between them.
>>>> I'm not sure what this means.
>>> Did you intend for the subject to be this long?
>> Probably not. I added "resubmitted" to the subject
> And the "Added support ..." was supposed to be in the subject, too?
>
>> How should I rectify this?
> Ensure there is an empty line after the subject.

Should I resubmit the patch then? (with the additional channels removed and fixed subject line)

>
>
> Regards,
> Clemens

Apologies for my stupid questions! :)

Re: [PATCH - Preliminary support for Xonar Xense (resubmitAdded support for Xonar Xense. Only speaker out and mic in working.

[Clemens Ladisch]

Ian Dawes wrote:
> On 30/07/13 07:36, Clemens Ladisch wrote:
>> Ian Dawes wrote:
>>> Clemens Ladisch <clemens@ladisch.de> wrote:
>>>> Ian Dawes wrote:
>>>>> Clemens Ladisch <clemens@ladisch.de> wrote:
>>>>>> Ian Dawes wrote:
>>>>>>> Signed-off-by: Ian Dawes <madeallup.gen@gmail.com>
>>>>>> The commit message was squashed into the subject line.  There's
>>>>>> probably an empty line missing between them.
>>>>> I'm not sure what this means.
>>>> Did you intend for the subject to be this long?
>>> Probably not. I added "resubmitted" to the subject
>> And the "Added support ..." was supposed to be in the subject, too?
>>
>>> How should I rectify this?
>> Ensure there is an empty line after the subject.
>
> Should I resubmit the patch then? (with the additional channels removed and fixed subject line)

Yes, please.


Regards,
Clemens