diff mbox

[alsa-lib,v2] Sync enum snd_hwdep_iface_t with include/asound/asound.h

Message ID 1408355117-9654-1-git-send-email-o-takashi@sakamocchi.jp (mailing list archive)
State Accepted
Delegated to: Takashi Iwai
Headers show

Commit Message

Takashi Sakamoto Aug. 18, 2014, 9:45 a.m. UTC
Some members in this enumerated type has not updated for 9 years, although
kernel-drivers added them during this period. This commit adds them following
to a commit 87df9f3 'sync include/asound/asound.h with 3.17-rc1 kernel'.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 include/hwdep.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Takashi Iwai Aug. 18, 2014, 10:56 a.m. UTC | #1
At Mon, 18 Aug 2014 18:45:17 +0900,
Takashi Sakamoto wrote:
> 
> Some members in this enumerated type has not updated for 9 years, although
> kernel-drivers added them during this period. This commit adds them following
> to a commit 87df9f3 'sync include/asound/asound.h with 3.17-rc1 kernel'.
> 
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

Applied, thanks.


Takashi

> ---
>  include/hwdep.h | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/include/hwdep.h b/include/hwdep.h
> index ab12822..6496fa2 100644
> --- a/include/hwdep.h
> +++ b/include/hwdep.h
> @@ -68,8 +68,13 @@ typedef enum _snd_hwdep_iface {
>  	SND_HWDEP_IFACE_USX2Y_PCM,	/**< Tascam US122, US224 & US428 raw USB PCM */
>  	SND_HWDEP_IFACE_PCXHR,		/**< Digigram PCXHR */
>  	SND_HWDEP_IFACE_SB_RC,		/**< SB Extigy/Audigy2NX remote control */
> -                
> -	SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_SB_RC  /**< last known hwdep interface */
> +	SND_HWDEP_IFACE_HDA,		/**< HD-audio */
> +	SND_HWDEP_IFACE_USB_STREAM,	/**< direct access to usb stream */
> +	SND_HWDEP_IFACE_FW_DICE,	/**< TC DICE FireWire device */
> +	SND_HWDEP_IFACE_FW_FIREWORKS,	/**< Echo Audio Fireworks based device */
> +	SND_HWDEP_IFACE_FW_BEBOB,	/**< BridgeCo BeBoB based device */
> +
> +	SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_FW_BEBOB  /**< last known hwdep interface */
>  } snd_hwdep_iface_t;
>  
>  /** open for reading */
> -- 
> 1.9.1
>
Takashi Sakamoto Aug. 18, 2014, 11:52 a.m. UTC | #2
On Aug 18 2014 19:56, Takashi Iwai wrote:
> At Mon, 18 Aug 2014 18:45:17 +0900,
> Takashi Sakamoto wrote:
>>
>> Some members in this enumerated type has not updated for 9 years, although
>> kernel-drivers added them during this period. This commit adds them following
>> to a commit 87df9f3 'sync include/asound/asound.h with 3.17-rc1 kernel'.
>>
>> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> 
> Applied, thanks.

Thank you.

I have a plan to work for OXFW driver in the rest of this year. My
patches includes SNDRV_HWDEP_IFACE_FW_OXFW for the same purpose the
other firewire drivers have.

I should add it to alsa-lib but I have no confidence for the timing.
Which is better, the same time to post the driver or the time Linux
kernel is released with the driver?


Thanks

Takashi Sakamoto
o-takashi@sakamocchi.jp
Takashi Iwai Aug. 18, 2014, 1:23 p.m. UTC | #3
At Mon, 18 Aug 2014 20:52:40 +0900,
Takashi Sakamoto wrote:
> 
> On Aug 18 2014 19:56, Takashi Iwai wrote:
> > At Mon, 18 Aug 2014 18:45:17 +0900,
> > Takashi Sakamoto wrote:
> >>
> >> Some members in this enumerated type has not updated for 9 years, although
> >> kernel-drivers added them during this period. This commit adds them following
> >> to a commit 87df9f3 'sync include/asound/asound.h with 3.17-rc1 kernel'.
> >>
> >> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> > 
> > Applied, thanks.
> 
> Thank you.
> 
> I have a plan to work for OXFW driver in the rest of this year. My
> patches includes SNDRV_HWDEP_IFACE_FW_OXFW for the same purpose the
> other firewire drivers have.
> 
> I should add it to alsa-lib but I have no confidence for the timing.
> Which is better, the same time to post the driver or the time Linux
> kernel is released with the driver?

At best, merge both kernel and user-space stuff at the same time.
So, please send both kernel and alsa-lib patches.  The merge to Linus
shall be postponed until the following merge window, of course, but it
shouldn't matter much.


Takashi
Takashi Sakamoto Aug. 18, 2014, 10:53 p.m. UTC | #4
On Aug 18 2014 22:23, Takashi Iwai wrote:
>> I have a plan to work for OXFW driver in the rest of this year. My
>> patches includes SNDRV_HWDEP_IFACE_FW_OXFW for the same purpose the
>> other firewire drivers have.
>>
>> I should add it to alsa-lib but I have no confidence for the timing.
>> Which is better, the same time to post the driver or the time Linux
>> kernel is released with the driver?
> 
> At best, merge both kernel and user-space stuff at the same time.
> So, please send both kernel and alsa-lib patches.  The merge to Linus
> shall be postponed until the following merge window, of course, but it
> shouldn't matter much.

OK, I see.


Thanks

Takashi Sakamoto
o-takashi@sakamocchi.jp
diff mbox

Patch

diff --git a/include/hwdep.h b/include/hwdep.h
index ab12822..6496fa2 100644
--- a/include/hwdep.h
+++ b/include/hwdep.h
@@ -68,8 +68,13 @@  typedef enum _snd_hwdep_iface {
 	SND_HWDEP_IFACE_USX2Y_PCM,	/**< Tascam US122, US224 & US428 raw USB PCM */
 	SND_HWDEP_IFACE_PCXHR,		/**< Digigram PCXHR */
 	SND_HWDEP_IFACE_SB_RC,		/**< SB Extigy/Audigy2NX remote control */
-                
-	SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_SB_RC  /**< last known hwdep interface */
+	SND_HWDEP_IFACE_HDA,		/**< HD-audio */
+	SND_HWDEP_IFACE_USB_STREAM,	/**< direct access to usb stream */
+	SND_HWDEP_IFACE_FW_DICE,	/**< TC DICE FireWire device */
+	SND_HWDEP_IFACE_FW_FIREWORKS,	/**< Echo Audio Fireworks based device */
+	SND_HWDEP_IFACE_FW_BEBOB,	/**< BridgeCo BeBoB based device */
+
+	SND_HWDEP_IFACE_LAST = SND_HWDEP_IFACE_FW_BEBOB  /**< last known hwdep interface */
 } snd_hwdep_iface_t;
 
 /** open for reading */