audio: fix inavlid debug message macro

Change-Id: Id7170e6de898e0bce3e7f69772990532bd2aee6e
Signed-off-by: Bongryul Lee <bongryul.lee@samsung.com>

diff --git a/os/audio/audio.c b/os/audio/audio.c
index e0fc931..6bf99eb 100644 (file)
--- a/os/audio/audio.c
+++ b/os/audio/audio.c
@@ -159,7 +159,7 @@ static int audio_open(FAR struct file *filep)
        uint8_t tmp;
        int ret;
 
-       audinfo("crefs: %d\n", upper->crefs);
+       audvdbg("crefs: %d\n", upper->crefs);
 
        /* Get exclusive access to the device structures */
 
@@ -209,7 +209,7 @@ static int audio_close(FAR struct file *filep)
        FAR struct audio_upperhalf_s *upper = inode->i_private;
        int ret;
 
-       audinfo("crefs: %d\n", upper->crefs);
+       audvdbg("crefs: %d\n", upper->crefs);
 
        /* Get exclusive access to the device structures */
 
@@ -235,7 +235,7 @@ static int audio_close(FAR struct file *filep)
                /* Disable the Audio device */
 
                DEBUGASSERT(lower->ops->shutdown != NULL);
-               audinfo("calling shutdown: %d\n");
+               audvdbg("calling shutdown: %d\n");
 
                lower->ops->shutdown(lower);
        }
@@ -361,7 +361,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #endif
        int ret;
 
-       audinfo("cmd: %d arg: %ld\n", cmd, arg);
+       audvdbg("cmd: %d arg: %ld\n", cmd, arg);
 
        /* Get exclusive access to the device structures */
 
@@ -382,7 +382,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
                FAR struct audio_caps_s *caps = (FAR struct audio_caps_s *)((uintptr_t) arg);
                DEBUGASSERT(lower->ops->getcaps != NULL);
 
-               audinfo("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type);
+               audvdbg("AUDIOIOC_GETCAPS: Device=%d\n", caps->ac_type);
 
                /* Call the lower-half driver capabilities handler */
 
@@ -394,7 +394,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
                FAR const struct audio_caps_desc_s *caps = (FAR const struct audio_caps_desc_s *)((uintptr_t) arg);
                DEBUGASSERT(lower->ops->configure != NULL);
 
-               audinfo("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type);
+               audvdbg("AUDIOIOC_INITIALIZE: Device=%d\n", caps->caps.ac_type);
 
                /* Call the lower-half driver configure handler */
 
@@ -409,7 +409,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
        case AUDIOIOC_SHUTDOWN: {
                DEBUGASSERT(lower->ops->shutdown != NULL);
 
-               audinfo("AUDIOIOC_SHUTDOWN\n");
+               audvdbg("AUDIOIOC_SHUTDOWN\n");
 
                /* Call the lower-half driver initialize handler */
                ret = lower->ops->shutdown(lower);
@@ -423,7 +423,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_START: {
-               audinfo("AUDIOIOC_START\n");
+               audvdbg("AUDIOIOC_START\n");
                DEBUGASSERT(lower->ops->start != NULL);
 
                /* Start the audio stream */
@@ -444,7 +444,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
        case AUDIOIOC_STOP: {
-               audinfo("AUDIOIOC_STOP\n");
+               audvdbg("AUDIOIOC_STOP\n");
                DEBUGASSERT(lower->ops->stop != NULL);
 
                if (upper->started) {
@@ -468,7 +468,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 #ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
 
        case AUDIOIOC_PAUSE: {
-               audinfo("AUDIOIOC_PAUSE\n");
+               audvdbg("AUDIOIOC_PAUSE\n");
                DEBUGASSERT(lower->ops->pause != NULL);
 
                if (upper->started) {
@@ -488,7 +488,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_RESUME: {
-               audinfo("AUDIOIOC_RESUME\n");
+               audvdbg("AUDIOIOC_RESUME\n");
                DEBUGASSERT(lower->ops->resume != NULL);
 
                if (upper->started) {
@@ -510,7 +510,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_ALLOCBUFFER: {
-               audinfo("AUDIOIOC_ALLOCBUFFER\n");
+               audvdbg("AUDIOIOC_ALLOCBUFFER\n");
 
                bufdesc = (FAR struct audio_buf_desc_s *)arg;
                if (lower->ops->allocbuffer) {
@@ -529,7 +529,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_FREEBUFFER: {
-               audinfo("AUDIOIOC_FREEBUFFER\n");
+               audvdbg("AUDIOIOC_FREEBUFFER\n");
 
                bufdesc = (FAR struct audio_buf_desc_s *)arg;
                if (lower->ops->freebuffer) {
@@ -550,7 +550,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_ENQUEUEBUFFER: {
-               audinfo("AUDIOIOC_ENQUEUEBUFFER\n");
+               audvdbg("AUDIOIOC_ENQUEUEBUFFER\n");
 
                DEBUGASSERT(lower->ops->enqueuebuffer != NULL);
 
@@ -565,7 +565,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_REGISTERMQ: {
-               audinfo("AUDIOIOC_REGISTERMQ\n");
+               audvdbg("AUDIOIOC_REGISTERMQ\n");
 
                upper->usermq = (mqd_t) arg;
                ret = OK;
@@ -578,7 +578,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_UNREGISTERMQ: {
-               audinfo("AUDIOIOC_UNREGISTERMQ\n");
+               audvdbg("AUDIOIOC_UNREGISTERMQ\n");
 
                upper->usermq = NULL;
                ret = OK;
@@ -591,7 +591,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_RESERVE: {
-               audinfo("AUDIOIOC_RESERVE\n");
+               audvdbg("AUDIOIOC_RESERVE\n");
                DEBUGASSERT(lower->ops->reserve != NULL);
 
                /* Call lower-half to perform the reservation */
@@ -610,7 +610,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         */
 
        case AUDIOIOC_RELEASE: {
-               audinfo("AUDIOIOC_RELEASE\n");
+               audvdbg("AUDIOIOC_RELEASE\n");
                DEBUGASSERT(lower->ops->release != NULL);
 
                /* Call lower-half to perform the release */
@@ -626,7 +626,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
        /* Any unrecognized IOCTL commands might be platform-specific ioctl commands */
 
        default: {
-               audinfo("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
+               audvdbg("Forwarding unrecognized cmd: %d arg: %ld\n", cmd, arg);
                DEBUGASSERT(lower->ops->ioctl != NULL);
                ret = lower->ops->ioctl(lower, cmd, arg);
        }
@@ -677,7 +677,7 @@ static inline void audio_dequeuebuffer(FAR struct audio_upperhalf_s *upper, FAR
 {
        struct audio_msg_s msg;
 
-       audinfo("Entry\n");
+       audvdbg("Entry\n");
 
        /* Send a dequeue message to the user if a message queue is registered */
 
@@ -710,7 +710,7 @@ static inline void audio_complete(FAR struct audio_upperhalf_s *upper, FAR struc
 {
        struct audio_msg_s msg;
 
-       audinfo("Entry\n");
+       audvdbg("Entry\n");
 
        /* Send a dequeue message to the user if a message queue is registered */
 
@@ -754,7 +754,7 @@ static void audio_callback(FAR void *handle, uint16_t reason, FAR struct ap_buff
 {
        FAR struct audio_upperhalf_s *upper = (FAR struct audio_upperhalf_s *)handle;
 
-       audinfo("Entry\n");
+       audvdbg("Entry\n");
 
        /* Perform operation based on reason code */
 
@@ -945,7 +945,7 @@ int audio_register(FAR const char *name, FAR struct audio_lowerhalf_s *dev)
        dev->upper = audio_callback;
        dev->priv = upper;
 
-       audinfo("Registering %s\n", path);
+       audvdbg("Registering %s\n", path);
        return register_driver(path, &g_audioops, 0666, upper);
 }
 

diff --git a/os/audio/pcm_decode.c b/os/audio/pcm_decode.c
index 1369c9c..1ddd2e2 100644 (file)
--- a/os/audio/pcm_decode.c
+++ b/os/audio/pcm_decode.c
@@ -262,23 +262,23 @@ static void pcm_callback(FAR void *arg, uint16_t reason, FAR struct ap_buffer_s
 #ifdef CONFIG_PCM_DEBUG
 static void pcm_dump(FAR const struct wav_header_s *wav)
 {
-       audinfo("Wave file header\n");
-       audinfo("  Header Chunk:\n");
-       audinfo("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
-       audinfo("    Chunk Size:      %u\n", wav->hdr.chunklen);
-       audinfo("    Format:          0x%08x\n", wav->hdr.format);
-       audinfo("  Format Chunk:\n");
-       audinfo("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
-       audinfo("    Chunk Size:      %u\n", wav->fmt.chunklen);
-       audinfo("    Audio Format:    0x%04x\n", wav->fmt.format);
-       audinfo("    Num. Channels:   %d\n", wav->fmt.nchannels);
-       audinfo("    Sample Rate:     %u\n", wav->fmt.samprate);
-       audinfo("    Byte Rate:       %u\n", wav->fmt.byterate);
-       audinfo("    Block Align:     %d\n", wav->fmt.align);
-       audinfo("    Bits Per Sample: %d\n", wav->fmt.bpsamp);
-       audinfo("  Data Chunk:\n");
-       audinfo("    Chunk ID:        0x%08x\n", wav->data.chunkid);
-       audinfo("    Chunk Size:      %u\n", wav->data.chunklen);
+       audvdbg("Wave file header\n");
+       audvdbg("  Header Chunk:\n");
+       audvdbg("    Chunk ID:        0x%08x\n", wav->hdr.chunkid);
+       audvdbg("    Chunk Size:      %u\n", wav->hdr.chunklen);
+       audvdbg("    Format:          0x%08x\n", wav->hdr.format);
+       audvdbg("  Format Chunk:\n");
+       audvdbg("    Chunk ID:        0x%08x\n", wav->fmt.chunkid);
+       audvdbg("    Chunk Size:      %u\n", wav->fmt.chunklen);
+       audvdbg("    Audio Format:    0x%04x\n", wav->fmt.format);
+       audvdbg("    Num. Channels:   %d\n", wav->fmt.nchannels);
+       audvdbg("    Sample Rate:     %u\n", wav->fmt.samprate);
+       audvdbg("    Byte Rate:       %u\n", wav->fmt.byterate);
+       audvdbg("    Block Align:     %d\n", wav->fmt.align);
+       audvdbg("    Bits Per Sample: %d\n", wav->fmt.bpsamp);
+       audvdbg("  Data Chunk:\n");
+       audvdbg("    Chunk ID:        0x%08x\n", wav->data.chunkid);
+       audvdbg("    Chunk Size:      %u\n", wav->data.chunklen);
 }
 #endif
 
@@ -417,7 +417,7 @@ static bool pcm_parsewav(FAR struct pcm_decode_s *priv, uint8_t *data)
 #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
 static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, uint8_t subsample)
 {
-       audinfo("subsample: %d\n", subsample);
+       audvdbg("subsample: %d\n", subsample);
 
        /* Three possibilities:
         *
@@ -431,7 +431,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, uint8_t subsa
                 */
 
                if (subsample != AUDIO_SUBSAMPLE_NONE) {
-                       audinfo("Start sub-sampling\n");
+                       audvdbg("Start sub-sampling\n");
 
                        /* Save the current subsample setting. Subsampling will begin on
                         * then next audio buffer that we receive.
@@ -448,7 +448,7 @@ static void pcm_subsample_configure(FAR struct pcm_decode_s *priv, uint8_t subsa
         */
 
        else if (subsample == AUDIO_SUBSAMPLE_NONE) {
-               audinfo("Stop sub-sampling\n");
+               audvdbg("Stop sub-sampling\n");
 
                /* Indicate that we are in normal play mode.  This will take effect
                 * when the next audio buffer is received.
@@ -717,7 +717,7 @@ static int pcm_configure(FAR struct audio_lowerhalf_s *dev, FAR const struct aud
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->configure);
 
-       audinfo("Defer to lower configure\n");
+       audvdbg("Defer to lower configure\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->configure(lower, session, caps);
 #else
@@ -755,7 +755,7 @@ static int pcm_shutdown(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->start);
 
-       audinfo("Defer to lower shutdown\n");
+       audvdbg("Defer to lower shutdown\n");
        return lower->ops->shutdown(lower);
 }
 
@@ -786,7 +786,7 @@ static int pcm_start(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->start);
 
-       audinfo("Defer to lower start\n");
+       audvdbg("Defer to lower start\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->start(lower, session);
 #else
@@ -825,7 +825,7 @@ static int pcm_stop(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->stop);
 
-       audinfo("Defer to lower stop\n");
+       audvdbg("Defer to lower stop\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->stop(lower, session);
 #else
@@ -859,7 +859,7 @@ static int pcm_pause(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->pause);
 
-       audinfo("Defer to lower pause\n");
+       audvdbg("Defer to lower pause\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->pause(lower, session);
 #else
@@ -892,7 +892,7 @@ static int pcm_resume(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->resume);
 
-       audinfo("Defer to lower resume\n");
+       audvdbg("Defer to lower resume\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->resume(lower, session);
 #else
@@ -925,7 +925,7 @@ static int pcm_allocbuffer(FAR struct audio_lowerhalf_s *dev, FAR struct audio_b
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->allocbuffer);
 
-       audinfo("Defer to lower allocbuffer\n");
+       audvdbg("Defer to lower allocbuffer\n");
        return lower->ops->allocbuffer(lower, apb);
 }
 
@@ -951,7 +951,7 @@ static int pcm_freebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct audio_bu
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->freebuffer);
 
-       audinfo("Defer to lower freebuffer, apb=%p\n", apb);
+       audvdbg("Defer to lower freebuffer, apb=%p\n", apb);
        return lower->ops->freebuffer(lower, apb);
 }
 
@@ -982,7 +982,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
        int ret;
 
        DEBUGASSERT(priv);
-       audinfo("Received buffer %p, streaming=%d\n", apb, priv->streaming);
+       audvdbg("Received buffer %p, streaming=%d\n", apb, priv->streaming);
 
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->enqueuebuffer && lower->ops->configure);
@@ -999,7 +999,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
                        priv->streaming = false;
                }
 #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
-               audinfo("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n", apb, apb->curbyte, apb->nbytes, apb->flags);
+               audvdbg("Received: apb=%p curbyte=%d nbytes=%d flags=%04x\n", apb, apb->curbyte, apb->nbytes, apb->flags);
 
                /* Perform any necessary sub-sampling operations */
 
@@ -1008,7 +1008,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
 
                /* Then give the audio buffer to the lower driver */
 
-               audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
+               audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
 
                return lower->ops->enqueuebuffer(lower, apb);
        }
@@ -1020,7 +1020,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
         */
 
        bytesleft = apb->nbytes - apb->curbyte;
-       audinfo("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n", apb->curbyte, apb->nbytes, apb->nmaxbytes, bytesleft);
+       audvdbg("curbyte=%d nbytes=%d nmaxbytes=%d bytesleft=%d\n", apb->curbyte, apb->nbytes, apb->nmaxbytes, bytesleft);
 
        if (bytesleft >= sizeof(struct wav_header_s)) {
                /* Parse and verify the candidate PCM WAV file header */
@@ -1056,7 +1056,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
                        apb->curbyte += sizeof(struct wav_header_s);
 
 #ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD
-                       audinfo("Begin streaming: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
+                       audvdbg("Begin streaming: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
 
                        /* Perform any necessary sub-sampling operations */
 
@@ -1065,7 +1065,7 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_bu
 
                        /* Then give the audio buffer to the lower driver */
 
-                       audinfo("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
+                       audvdbg("Pass to lower enqueuebuffer: apb=%p curbyte=%d nbytes=%d\n", apb, apb->curbyte, apb->nbytes);
 
                        ret = lower->ops->enqueuebuffer(lower, apb);
                        if (ret == OK) {
@@ -1127,7 +1127,7 @@ static int pcm_cancelbuffer(FAR struct audio_lowerhalf_s *dev, FAR struct ap_buf
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->cancelbuffer);
 
-       audinfo("Defer to lower cancelbuffer, apb=%p\n", apb);
+       audvdbg("Defer to lower cancelbuffer, apb=%p\n", apb);
        return lower->ops->cancelbuffer(lower, apb);
 }
 
@@ -1151,7 +1151,7 @@ static int pcm_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, unsigned long a
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->ioctl);
 
-       audinfo("Defer to lower ioctl, cmd=%d arg=%ld\n");
+       audvdbg("Defer to lower ioctl, cmd=%d arg=%ld\n");
        return lower->ops->ioctl(lower, cmd, arg);
 }
 
@@ -1196,7 +1196,7 @@ static int pcm_reserve(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->reserve);
 
-       audinfo("Defer to lower reserve\n");
+       audvdbg("Defer to lower reserve\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        ret = lower->ops->reserve(lower, &priv->session);
 
@@ -1238,7 +1238,7 @@ static int pcm_release(FAR struct audio_lowerhalf_s *dev)
        lower = priv->lower;
        DEBUGASSERT(lower && lower->ops->release);
 
-       audinfo("Defer to lower release\n");
+       audvdbg("Defer to lower release\n");
 #ifdef CONFIG_AUDIO_MULTI_SESSION
        return lower->ops->release(lower, session);
 #else