You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by "pkarashchenko (via GitHub)" <gi...@apache.org> on 2023/07/31 18:35:37 UTC
[GitHub] [nuttx] pkarashchenko commented on a diff in pull request #9912: driver/audio/cxd56: Support 24bit, 192kHz and 4ch max
pkarashchenko commented on code in PR #9912:
URL: https://github.com/apache/nuttx/pull/9912#discussion_r1279724424
##########
drivers/audio/cxd56.c:
##########
@@ -1938,32 +1982,38 @@ static int cxd56_power_on_analog_output(FAR struct cxd56_dev_s *dev)
return OK;
}
-static void cxd56_set_mic_gains(uint8_t gain,
+static int cxd56_set_mic_gains(uint8_t gain, enum cxd56_mic_type_e mic_dev,
struct cxd56_aca_pwinput_param_s *param)
{
- uint8_t i;
- uint8_t pga_gain;
- uint8_t mic_id = 0;
- uint8_t mic_sel = 0;
+ int i;
+ uint32_t mic_gain = (gain >= CXD56_MIC_GAIN_MAX) ? CXD56_MIC_GAIN_MAX :
+ (gain / 30) * 30;
+ uint32_t pga_gain = mic_gain - gain;
+ pga_gain = (pga_gain >= CXD56_MIC_PGA_GAIN_MAX) ?
+ CXD56_MIC_PGA_GAIN_MAX : pga_gain;
- /* TODO: Replace gain param with array in dev. How to configure? */
+ param->mic_dev = CXD56_ACA_MIC_AMIC;
+ param->mic_bias_sel = CXD56_AUDIO_CFG_MICBIAS_SEL_2_0V;
+ for (i = 0; i < 4; i++)
+ {
+ param->mic_gain[i] = mic_gain;
+ param->pga_gain[i] = pga_gain;
+ param->vgain[i] = 0;
+ }
- for (i = 0; i < CXD56_IN_CHANNELS_MAX; i++)
+ if (fw_as_acacontrol(CXD56_ACA_CTL_INIT_AMIC,
+ (uint32_t)param) != 0)
{
- mic_sel = (CXD56_AUDIO_CFG_MIC >> (i * CXD56_MIC_CH_BITNUM)) &
- CXD56_MIC_CH_BITMAP;
- if ((mic_sel >= 1) && (mic_sel <= 4))
- {
- mic_id = mic_sel - 1;
- param->mic_gain[mic_id] = (gain >= CXD56_MIC_GAIN_MAX) ?
- CXD56_MIC_GAIN_MAX :
- (gain / 30) * 30;
-
- pga_gain = gain - param->mic_gain[mic_id];
- param->pga_gain[mic_id] = (pga_gain >= CXD56_MIC_PGA_GAIN_MAX) ?
- CXD56_MIC_PGA_GAIN_MAX : pga_gain;
- }
+ return -EBUSY;
}
+
+ if (fw_as_acacontrol(CXD56_ACA_CTL_POWER_ON_INPUT,
+ (uint32_t)param) != 0)
Review Comment:
```suggestion
if (fw_as_acacontrol(CXD56_ACA_CTL_POWER_ON_INPUT,
(uint32_t)param) != 0)
```
##########
drivers/audio/cxd56.c:
##########
@@ -1938,32 +1982,38 @@ static int cxd56_power_on_analog_output(FAR struct cxd56_dev_s *dev)
return OK;
}
-static void cxd56_set_mic_gains(uint8_t gain,
+static int cxd56_set_mic_gains(uint8_t gain, enum cxd56_mic_type_e mic_dev,
struct cxd56_aca_pwinput_param_s *param)
Review Comment:
```suggestion
static int cxd56_set_mic_gains(uint8_t gain, enum cxd56_mic_type_e mic_dev,
struct cxd56_aca_pwinput_param_s *param)
```
##########
drivers/audio/cxd56.c:
##########
@@ -1938,32 +1982,38 @@ static int cxd56_power_on_analog_output(FAR struct cxd56_dev_s *dev)
return OK;
}
-static void cxd56_set_mic_gains(uint8_t gain,
+static int cxd56_set_mic_gains(uint8_t gain, enum cxd56_mic_type_e mic_dev,
struct cxd56_aca_pwinput_param_s *param)
{
- uint8_t i;
- uint8_t pga_gain;
- uint8_t mic_id = 0;
- uint8_t mic_sel = 0;
+ int i;
+ uint32_t mic_gain = (gain >= CXD56_MIC_GAIN_MAX) ? CXD56_MIC_GAIN_MAX :
+ (gain / 30) * 30;
+ uint32_t pga_gain = mic_gain - gain;
+ pga_gain = (pga_gain >= CXD56_MIC_PGA_GAIN_MAX) ?
+ CXD56_MIC_PGA_GAIN_MAX : pga_gain;
- /* TODO: Replace gain param with array in dev. How to configure? */
+ param->mic_dev = CXD56_ACA_MIC_AMIC;
+ param->mic_bias_sel = CXD56_AUDIO_CFG_MICBIAS_SEL_2_0V;
+ for (i = 0; i < 4; i++)
+ {
+ param->mic_gain[i] = mic_gain;
+ param->pga_gain[i] = pga_gain;
+ param->vgain[i] = 0;
+ }
- for (i = 0; i < CXD56_IN_CHANNELS_MAX; i++)
+ if (fw_as_acacontrol(CXD56_ACA_CTL_INIT_AMIC,
+ (uint32_t)param) != 0)
Review Comment:
```suggestion
if (fw_as_acacontrol(CXD56_ACA_CTL_INIT_AMIC,
(uint32_t)param) != 0)
```
##########
drivers/audio/cxd56_src.c:
##########
@@ -427,7 +427,7 @@ int cxd56_src_init(FAR struct cxd56_dev_s *dev,
snprintf(g_src.mqname, sizeof(g_src.mqname), "/tmp/%X",
(unsigned int) &g_src);
Review Comment:
```suggestion
(unsigned int)&g_src);
```
##########
drivers/audio/cxd56.c:
##########
@@ -2768,10 +2799,21 @@ static int cxd56_configure(FAR struct audio_lowerhalf_s *lower,
{
/* Set the mic gain */
+ /* mic_gain range : 0 ~ 210 (= 150 + 60) */
+
priv->mic_gain = caps->ac_controls.hw[0];
audinfo(" Mic gain: %d\n", priv->mic_gain);
- /* TODO: How to set individual mic gains? */
+ if (priv->state != CXD56_DEV_STATE_OFF &&
+ priv->state != CXD56_DEV_STATE_STOPPED )
Review Comment:
```suggestion
priv->state != CXD56_DEV_STATE_STOPPED)
```
##########
drivers/audio/cxd56.c:
##########
@@ -2830,7 +2874,7 @@ static int cxd56_configure(FAR struct audio_lowerhalf_s *lower,
audinfo("Configured input using %d:\n", priv->dma_handle);
audinfo(" Channels: %d\n", priv->channels);
- audinfo(" Samplerate: %d\n", priv->samplerate);
+ audinfo(" Samplerate: %ld\n", priv->samplerate);
Review Comment:
```suggestion
audinfo(" Samplerate: %" PRIu32 "\n", priv->samplerate);
```
##########
drivers/audio/cxd56_src.c:
##########
@@ -427,7 +427,7 @@ int cxd56_src_init(FAR struct cxd56_dev_s *dev,
snprintf(g_src.mqname, sizeof(g_src.mqname), "/tmp/%X",
(unsigned int) &g_src);
- audinfo("SRC: Init (rate = %d, channels = %d, width = %d)\n",
+ audinfo("SRC: Init (rate = %ld, channels = %d, width = %d)\n",
Review Comment:
```suggestion
audinfo("SRC: Init (rate = %" PRIu32 ", channels = %d, width = %d)\n",
```
##########
drivers/audio/cxd56.c:
##########
@@ -2811,7 +2854,7 @@ static int cxd56_configure(FAR struct audio_lowerhalf_s *lower,
audinfo("Configured output using %d:\n", priv->dma_handle);
audinfo(" Channels: %d\n", priv->channels);
- audinfo(" Samplerate: %d\n", priv->samplerate);
+ audinfo(" Samplerate: %ld\n", priv->samplerate);
Review Comment:
```suggestion
audinfo(" Samplerate: %" PRIu32 "\n", priv->samplerate);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org