[alsa-devel] [PATCH 1/2] ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com --- include/uapi/sound/asound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 46145a5277fe..a45be6bdcf5b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -864,7 +864,7 @@ struct snd_ctl_elem_id { snd_ctl_elem_iface_t iface; /* interface identifier */ unsigned int device; /* device/client number */ unsigned int subdevice; /* subdevice (substream) number */ - unsigned char name[44]; /* ASCII name of item */ + unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* ASCII name of item */ unsigned int index; /* index of item */ };
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com --- sound/soc/intel/atom/sst-atom-controls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/atom/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h index daecc58f28af..c55f76a535b3 100644 --- a/sound/soc/intel/atom/sst-atom-controls.h +++ b/sound/soc/intel/atom/sst-atom-controls.h @@ -695,7 +695,7 @@ struct sst_gain_mixer_control { u16 module_id; u16 pipe_id; u16 task_id; - char pname[44]; + char pname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; struct snd_soc_dapm_widget *w; };
At Fri, 17 Apr 2015 22:53:33 +0530, Vinod Koul wrote:
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com
I leave this to Mark.
thanks,
Takashi
sound/soc/intel/atom/sst-atom-controls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/atom/sst-atom-controls.h b/sound/soc/intel/atom/sst-atom-controls.h index daecc58f28af..c55f76a535b3 100644 --- a/sound/soc/intel/atom/sst-atom-controls.h +++ b/sound/soc/intel/atom/sst-atom-controls.h @@ -695,7 +695,7 @@ struct sst_gain_mixer_control { u16 module_id; u16 pipe_id; u16 task_id;
- char pname[44];
- char pname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; struct snd_soc_dapm_widget *w;
};
-- 1.7.9.5
At Fri, 17 Apr 2015 22:53:32 +0530, Vinod Koul wrote:
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com
Applied, thanks.
Takashi
include/uapi/sound/asound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 46145a5277fe..a45be6bdcf5b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -864,7 +864,7 @@ struct snd_ctl_elem_id { snd_ctl_elem_iface_t iface; /* interface identifier */ unsigned int device; /* device/client number */ unsigned int subdevice; /* subdevice (substream) number */
- unsigned char name[44]; /* ASCII name of item */
- unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* ASCII name of item */ unsigned int index; /* index of item */
};
-- 1.7.9.5
On Apr 18 2015 02:23, Vinod Koul wrote:
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com
include/uapi/sound/asound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 46145a5277fe..a45be6bdcf5b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -864,7 +864,7 @@ struct snd_ctl_elem_id { snd_ctl_elem_iface_t iface; /* interface identifier */ unsigned int device; /* device/client number */ unsigned int subdevice; /* subdevice (substream) number */
- unsigned char name[44]; /* ASCII name of item */
- unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* ASCII name of item */ unsigned int index; /* index of item */
};
I think it better to post the same patch to alsa-lib when you add some changes to ALSA uapi headers because alsa-lib should also have the same headers.
# I also realized that recent timestamping improvements are not still # included in alsa-lib header.
Regards
Takashi Sakamoto
At Sun, 19 Apr 2015 13:55:46 +0900, Takashi Sakamoto wrote:
On Apr 18 2015 02:23, Vinod Koul wrote:
we have defined SNDRV_CTL_ELEM_ID_NAME_MAXLEN as size of name array so use this define instead of numeric value
Signed-off-by: Vinod Koul vinod.koul@intel.com
include/uapi/sound/asound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 46145a5277fe..a45be6bdcf5b 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -864,7 +864,7 @@ struct snd_ctl_elem_id { snd_ctl_elem_iface_t iface; /* interface identifier */ unsigned int device; /* device/client number */ unsigned int subdevice; /* subdevice (substream) number */
- unsigned char name[44]; /* ASCII name of item */
- unsigned char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* ASCII name of item */ unsigned int index; /* index of item */
};
I think it better to post the same patch to alsa-lib when you add some changes to ALSA uapi headers because alsa-lib should also have the same headers.
Right. I copied the file and updated alsa-lib side now.
# I also realized that recent timestamping improvements are not still # included in alsa-lib header.
Yeah, that stuff seems forgotten.
Pierre, could you respin your patches for review?
thanks,
Takashi
At Tue, 21 Apr 2015 07:46:48 -0700, Pierre-Louis Bossart wrote:
# I also realized that recent timestamping improvements are not still # included in alsa-lib header.
Yeah, that stuff seems forgotten.
Pierre, could you respin your patches for review?
will do later this week. alsa-lib only, right?
Yes, the kernel part has been already merged.
Takashi
participants (5)
-
Mark Brown -
Pierre-Louis Bossart -
Takashi Iwai -
Takashi Sakamoto -
Vinod Koul