Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Change *err() to either info() or err(ERROR:..), depending upon if an error has occurred.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-16 09:38:16 -06:00
parent 8c76779bc0
commit f9652812e2
25 changed files with 439 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/Kconfig
+3 -3
View File
@@ -6215,7 +6215,7 @@ endchoice
config STM32_ETHMAC_REGDEBUG config STM32_ETHMAC_REGDEBUG
bool "Register-Level Debug" bool "Register-Level Debug"
default n default n
depends on DEBUG_FEATURES depends on DEBUG_NET_INFO
---help--- ---help---
Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES. Enable very low-level register access debug. Depends on CONFIG_DEBUG_FEATURES.
@@ -6305,14 +6305,14 @@ menu "USB Host Debug Configuration"
config STM32_USBHOST_REGDEBUG config STM32_USBHOST_REGDEBUG
bool "Register-Level Debug" bool "Register-Level Debug"
default n default n
depends on USBHOST && (STM32_OTGFS || STM32_OTGHS) depends on USBHOST && DEBUG_USB_INFO && (STM32_OTGFS || STM32_OTGHS)
---help--- ---help---
Enable very low-level register access debug. Enable very low-level register access debug.
config STM32_USBHOST_PKTDUMP config STM32_USBHOST_PKTDUMP
bool "Packet Dump Debug" bool "Packet Dump Debug"
default n default n
depends on USBHOST && (STM32_OTGFS || STM32_OTGHS) depends on USBHOST && DEBUG_USB_INFO && (STM32_OTGFS || STM32_OTGHS)
---help--- ---help---
Dump all incoming and outgoing USB packets. Dump all incoming and outgoing USB packets.
arch/arm/src/stm32/stm32_adc.c
+9 -9
View File
@@ -906,7 +906,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
if (prescaler < 1) if (prescaler < 1)
{ {
aerr("WARNING: Prescaler underflowed.\n"); awarn("WARNING: Prescaler underflowed.\n");
prescaler = 1; prescaler = 1;
} }
@@ -914,7 +914,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
else if (prescaler > 65536) else if (prescaler > 65536)
{ {
aerr("WARNING: Prescaler overflowed.\n"); awarn("WARNING: Prescaler overflowed.\n");
prescaler = 65536; prescaler = 65536;
} }
@@ -923,12 +923,12 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
reload = timclk / priv->freq; reload = timclk / priv->freq;
if (reload < 1) if (reload < 1)
{ {
aerr("WARNING: Reload value underflowed.\n"); awarn("WARNING: Reload value underflowed.\n");
reload = 1; reload = 1;
} }
else if (reload > 65535) else if (reload > 65535)
{ {
aerr("WARNING: Reload value overflowed.\n"); awarn("WARNING: Reload value overflowed.\n");
reload = 65535; reload = 65535;
} }
@@ -1070,7 +1070,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
break; break;
default: default:
aerr("No such trigger: %d\n", priv->trigger); aerr("ERROR: No such trigger: %d\n", priv->trigger);
return -EINVAL; return -EINVAL;
} }
@@ -2002,7 +2002,7 @@ static void adc_reset(FAR struct adc_dev_s *dev)
ret = adc_timinit(priv); ret = adc_timinit(priv);
if (ret < 0) if (ret < 0)
{ {
aerr("adc_timinit failed: %d\n", ret); aerr("ERROR: adc_timinit failed: %d\n", ret);
} }
} }
#ifndef CONFIG_ADC_NO_STARTUP_CONV #ifndef CONFIG_ADC_NO_STARTUP_CONV
@@ -2718,12 +2718,12 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
if ((regval & ADC_ISR_AWD) != 0) if ((regval & ADC_ISR_AWD) != 0)
{ {
allerr("WARNING: Analog Watchdog, Value converted out of range!\n"); allwarn("WARNING: Analog Watchdog, Value converted out of range!\n");
} }
if ((regval & ADC_ISR_OVR) != 0) if ((regval & ADC_ISR_OVR) != 0)
{ {
allerr("WARNING: Overrun has occurred!\n"); allwarn("WARNING: Overrun has occurred!\n");
} }
/* EOC: End of conversion */ /* EOC: End of conversion */
@@ -3012,7 +3012,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
break; break;
#endif #endif
default: default:
aerr("No ADC interface defined\n"); aerr("ERROR: No ADC interface defined\n");
return NULL; return NULL;
} }
arch/arm/src/stm32/stm32_bbsram.c
+13 -9
View File
@@ -75,6 +75,10 @@
#define MAX_OPENCNT (255) /* Limit of uint8_t */ #define MAX_OPENCNT (255) /* Limit of uint8_t */
#ifndef CONFIG_DEBUG_INFO
# undef CONFIG_BBSRAM_DEBUG
#endif
#if defined(CONFIG_BBSRAM_DEBUG) #if defined(CONFIG_BBSRAM_DEBUG)
# define BBSRAM_DEBUG_READ() stm32_bbsram_rd() # define BBSRAM_DEBUG_READ() stm32_bbsram_rd()
# define BBSRAM_DUMP(p,s) stm32_bbsram_dump(p,s) # define BBSRAM_DUMP(p,s) stm32_bbsram_dump(p,s)
@@ -183,15 +187,15 @@ static void stm32_bbsram_rd(void)
static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op) static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
{ {
BBSRAM_DEBUG_READ(); BBSRAM_DEBUG_READ();
llerr("%s:\n", op); info("%s:\n", op);
llerr(" File Address:0x%8x\n", bbf); info(" File Address:0x%8x\n", bbf);
llerr(" crc:0x%8x\n", bbf->crc); info(" crc:0x%8x\n", bbf->crc);
llerr(" fileno:%d\n", (int) bbf->fileno); info(" fileno:%d\n", (int) bbf->fileno);
llerr(" dirty:%d\n", (int) bbf->dirty); info(" dirty:%d\n", (int) bbf->dirty);
llerr(" length:%d\n", (int) bbf->len); info(" length:%d\n", (int) bbf->len);
llerr(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec); info(" time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec);
llerr(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n", info(" data: 0x%2x 0x%2x 0x%2x 0x%2x 0x%2x\n",
bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]); bbf->data[0], bbf->data[1], bbf->data[2], bbf->data[3], bbf->data[4]);
} }
#endif #endif
arch/arm/src/stm32/stm32_dac.c
+6 -6
View File
@@ -852,7 +852,7 @@ static int dac_timinit(FAR struct stm32_chan_s *chan)
break; break;
#endif #endif
default: default:
aerr("Could not enable timer\n"); aerr("ERROR: Could not enable timer\n");
break; break;
} }
@@ -1016,7 +1016,7 @@ static int dac_chaninit(FAR struct stm32_chan_s *chan)
chan->dma = stm32_dmachannel(chan->dmachan); chan->dma = stm32_dmachannel(chan->dmachan);
if (!chan->dma) if (!chan->dma)
{ {
aerr("Failed to allocate a DMA channel\n"); aerr("ERROR: Failed to allocate a DMA channel\n");
return -EBUSY; return -EBUSY;
} }
@@ -1025,7 +1025,7 @@ static int dac_chaninit(FAR struct stm32_chan_s *chan)
ret = dac_timinit(chan); ret = dac_timinit(chan);
if (ret < 0) if (ret < 0)
{ {
aerr("Failed to initialize the DMA timer: %d\n", ret); aerr("ERROR: Failed to initialize the DMA timer: %d\n", ret);
return ret; return ret;
} }
} }
@@ -1128,7 +1128,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
else else
#endif #endif
{ {
aerr("No such DAC interface: %d\n", intf); aerr("ERROR: No such DAC interface: %d\n", intf);
errno = ENODEV; errno = ENODEV;
return NULL; return NULL;
} }
@@ -1138,7 +1138,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
ret = dac_blockinit(); ret = dac_blockinit();
if (ret < 0) if (ret < 0)
{ {
aerr("Failed to initialize the DAC block: %d\n", ret); aerr("ERROR: Failed to initialize the DAC block: %d\n", ret);
errno = -ret; errno = -ret;
return NULL; return NULL;
} }
@@ -1149,7 +1149,7 @@ FAR struct dac_dev_s *stm32_dacinitialize(int intf)
ret = dac_chaninit(chan); ret = dac_chaninit(chan);
if (ret < 0) if (ret < 0)
{ {
aerr("Failed to initialize DAC channel %d: %d\n", intf, ret); aerr("ERROR: Failed to initialize DAC channel %d: %d\n", intf, ret);
errno = -ret; errno = -ret;
return NULL; return NULL;
} }
arch/arm/src/stm32/stm32_dma2d.c
+68 -68
View File
@@ -137,8 +137,8 @@
/* Debug option */ /* Debug option */
#ifdef CONFIG_STM32_DMA2D_REGDEBUG #ifdef CONFIG_STM32_DMA2D_REGDEBUG
# define regerr err # define regerr lcderr
# define reginfo info # define reginfo lcdinfo
#else #else
# define regerr(x...) # define regerr(x...)
# define reginfo(x...) # define reginfo(x...)
@@ -408,7 +408,7 @@ static void stm32_dma2d_control(uint32_t setbits, uint32_t clrbits)
{ {
uint32_t cr; uint32_t cr;
ginfo("setbits=%08x, clrbits=%08x\n", setbits, clrbits); lcdinfo("setbits=%08x, clrbits=%08x\n", setbits, clrbits);
cr = getreg32(STM32_DMA2D_CR); cr = getreg32(STM32_DMA2D_CR);
cr &= ~clrbits; cr &= ~clrbits;
@@ -469,7 +469,7 @@ static int stm32_dma2dirq(int irq, void *context)
if (ret != OK) if (ret != OK)
{ {
err("sem_post() failed\n"); lcderr("ERROR: sem_post() failed\n");
return ret; return ret;
} }
} }
@@ -512,7 +512,7 @@ static int stm32_dma2d_waitforirq(void)
if (ret != OK) if (ret != OK)
{ {
err("sem_wait() failed\n"); lcderr("ERROR: sem_wait() failed\n");
return ret; return ret;
} }
} }
@@ -632,7 +632,7 @@ static uint32_t stm32_dma2d_memaddress(FAR const struct stm32_dma2d_s *layer,
offset = xpos * DMA2D_PF_BYPP(layer->pinfo.bpp) + layer->pinfo.stride * ypos; offset = xpos * DMA2D_PF_BYPP(layer->pinfo.bpp) + layer->pinfo.stride * ypos;
ginfo("%p\n", ((uint32_t) pinfo->fbmem) + offset); lcdinfo("%p\n", ((uint32_t) pinfo->fbmem) + offset);
return ((uint32_t) pinfo->fbmem) + offset; return ((uint32_t) pinfo->fbmem) + offset;
} }
@@ -655,7 +655,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer,
{ {
/* offset at the end of each line in the context to the area layer */ /* offset at the end of each line in the context to the area layer */
ginfo("%d\n", layer->vinfo.xres - area->xres); lcdinfo("%d\n", layer->vinfo.xres - area->xres);
return layer->vinfo.xres - area->xres; return layer->vinfo.xres - area->xres;
} }
@@ -677,7 +677,7 @@ static fb_coord_t stm32_dma2d_lineoffset(FAR const struct stm32_dma2d_s *layer,
static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap) static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
{ {
ginfo("fmt=%d, fmtmap=%p\n", fmt, fmtmap); lcdinfo("fmt=%d, fmtmap=%p\n", fmt, fmtmap);
/* Map to the controller known format /* Map to the controller known format
* *
@@ -711,7 +711,7 @@ static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
break; break;
#endif #endif
default: default:
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -736,7 +736,7 @@ static int stm32_dma2d_pixelformat(uint8_t fmt, uint8_t *fmtmap)
static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp) static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp)
{ {
ginfo("fmt=%d, bpp=%p\n", fmt, bpp); lcdinfo("fmt=%d, bpp=%p\n", fmt, bpp);
switch (fmt) switch (fmt)
{ {
@@ -756,7 +756,7 @@ static int stm32_dma2d_bpp(uint8_t fmt, uint8_t *bpp)
break; break;
#endif #endif
default: default:
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -937,7 +937,7 @@ static void stm32_dma2d_linit(FAR struct stm32_dma2d_s *layer,
{ {
FAR struct dma2d_layer_s *priv = &layer->dma2d; FAR struct dma2d_layer_s *priv = &layer->dma2d;
ginfo("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt); lcdinfo("layer=%p, lid=%d, fmt=%02x\n", layer, lid, fmt);
/* initialize the layer interface */ /* initialize the layer interface */
@@ -985,8 +985,8 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid,
fb_coord_t xpos, fb_coord_t ypos, fb_coord_t xpos, fb_coord_t ypos,
FAR const struct ltdc_area_s *area) FAR const struct ltdc_area_s *area)
{ {
ginfo("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n", lcdinfo("layer=%p, lid=%d, xpos=%d, ypos=%d, area=%p\n",
layer, lid, xpos, ypos, area); layer, lid, xpos, ypos, area);
putreg32(stm32_dma2d_memaddress(layer, xpos, ypos), stm32_mar_layer_t[lid]); putreg32(stm32_dma2d_memaddress(layer, xpos, ypos), stm32_mar_layer_t[lid]);
putreg32(stm32_dma2d_lineoffset(layer, area), stm32_or_layer_t[lid]); putreg32(stm32_dma2d_lineoffset(layer, area), stm32_or_layer_t[lid]);
@@ -1006,7 +1006,7 @@ static void stm32_dma2d_lfifo(FAR const struct stm32_dma2d_s *layer, int lid,
static void stm32_dma2d_lcolor(FAR const struct stm32_dma2d_s *layer, static void stm32_dma2d_lcolor(FAR const struct stm32_dma2d_s *layer,
int lid, uint32_t color) int lid, uint32_t color)
{ {
ginfo("layer=%p, lid=%d, color=%08x\n", layer, lid, color); lcdinfo("layer=%p, lid=%d, color=%08x\n", layer, lid, color);
putreg32(color, stm32_color_layer_t[lid]); putreg32(color, stm32_color_layer_t[lid]);
} }
@@ -1027,7 +1027,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer,
{ {
uint32_t nlrreg; uint32_t nlrreg;
ginfo("pixel per line: %d, number of lines: %d\n", area->xres, area->yres); lcdinfo("pixel per line: %d, number of lines: %d\n", area->xres, area->yres);
nlrreg = getreg32(STM32_DMA2D_NLR); nlrreg = getreg32(STM32_DMA2D_NLR);
nlrreg = (DMA2D_NLR_PL(area->xres) | DMA2D_NLR_NL(area->yres)); nlrreg = (DMA2D_NLR_PL(area->xres) | DMA2D_NLR_NL(area->yres));
@@ -1047,7 +1047,7 @@ static void stm32_dma2d_llnr(FAR struct stm32_dma2d_s *layer,
static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer) static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer)
{ {
ginfo("layer=%p\n", layer); lcdinfo("layer=%p\n", layer);
/* CLUT format isn't supported by the dma2d controller */ /* CLUT format isn't supported by the dma2d controller */
@@ -1055,8 +1055,8 @@ static int stm32_dma2d_loutpfc(FAR const struct stm32_dma2d_s *layer)
{ {
/* Destination layer doesn't support CLUT output */ /* Destination layer doesn't support CLUT output */
gerr("ERROR: Returning ENOSYS, " lcderr("ERROR: Returning ENOSYS, "
"output to layer with CLUT format not supported.\n"); "output to layer with CLUT format not supported.\n");
return -ENOSYS; return -ENOSYS;
} }
@@ -1083,7 +1083,7 @@ static void stm32_dma2d_lpfc(FAR const struct stm32_dma2d_s *layer,
{ {
uint32_t pfccrreg; uint32_t pfccrreg;
ginfo("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode); lcdinfo("layer=%p, lid=%d, blendmode=%08x\n", layer, lid, blendmode);
/* Set color format */ /* Set color format */
@@ -1172,7 +1172,7 @@ static int stm32_dma2dgetvideoinfo(FAR struct dma2d_layer_s *layer,
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, vinfo=%p\n", layer, vinfo); lcdinfo("layer=%p, vinfo=%p\n", layer, vinfo);
if (stm32_dma2d_lvalidate(priv) && vinfo) if (stm32_dma2d_lvalidate(priv) && vinfo)
{ {
@@ -1183,7 +1183,7 @@ static int stm32_dma2dgetvideoinfo(FAR struct dma2d_layer_s *layer,
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -ENOSYS; return -ENOSYS;
} }
@@ -1209,7 +1209,7 @@ static int stm32_dma2dgetplaneinfo(FAR struct dma2d_layer_s *layer, int planeno,
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo); lcdinfo("layer=%p, planeno=%d, pinfo=%p\n", layer, planeno, pinfo);
if (stm32_dma2d_lvalidate(priv) && pinfo && planeno == 0) if (stm32_dma2d_lvalidate(priv) && pinfo && planeno == 0)
{ {
@@ -1220,7 +1220,7 @@ static int stm32_dma2dgetplaneinfo(FAR struct dma2d_layer_s *layer, int planeno,
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1244,7 +1244,7 @@ static int stm32_dma2dgetlid(FAR struct dma2d_layer_s *layer, int *lid)
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, lid=%p\n", layer, lid); lcdinfo("layer=%p, lid=%p\n", layer, lid);
if (stm32_dma2d_lvalidate(priv) && lid) if (stm32_dma2d_lvalidate(priv) && lid)
{ {
@@ -1254,7 +1254,7 @@ static int stm32_dma2dgetlid(FAR struct dma2d_layer_s *layer, int *lid)
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1282,7 +1282,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
int ret; int ret;
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, cmap=%p\n", layer, cmap); lcdinfo("layer=%p, cmap=%p\n", layer, cmap);
if (stm32_dma2d_lvalidate(priv) && cmap) if (stm32_dma2d_lvalidate(priv) && cmap)
{ {
@@ -1320,14 +1320,14 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
if (priv->fmt != DMA2D_PF_L8) if (priv->fmt != DMA2D_PF_L8)
{ {
gerr("Error: CLUT is not supported for the pixel format: %d\n", lcderr("ERROR: CLUT is not supported for the pixel format: %d\n",
priv->vinfo.fmt); priv->vinfo.fmt);
ret = -EINVAL; ret = -EINVAL;
} }
else if (cmap->first >= STM32_DMA2D_NCLUT) else if (cmap->first >= STM32_DMA2D_NCLUT)
{ {
gerr("Error: only %d color table entries supported\n", lcderr("ERROR: only %d color table entries supported\n",
STM32_DMA2D_NCLUT); STM32_DMA2D_NCLUT);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -1374,7 +1374,7 @@ static int stm32_dma2dsetclut(FAR struct dma2d_layer_s *layer,
return ret; return ret;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1401,7 +1401,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
int ret; int ret;
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, cmap=%p\n", layer, cmap); lcdinfo("layer=%p, cmap=%p\n", layer, cmap);
if (stm32_dma2d_lvalidate(priv) && cmap) if (stm32_dma2d_lvalidate(priv) && cmap)
{ {
@@ -1409,14 +1409,14 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
if (priv->fmt != DMA2D_PF_L8) if (priv->fmt != DMA2D_PF_L8)
{ {
gerr("Error: CLUT is not supported for the pixel format: %d\n", lcderr("ERROR: CLUT is not supported for the pixel format: %d\n",
priv->vinfo.fmt); priv->vinfo.fmt);
ret = -EINVAL; ret = -EINVAL;
} }
else if (cmap->first >= STM32_DMA2D_NCLUT) else if (cmap->first >= STM32_DMA2D_NCLUT)
{ {
gerr("Error: only %d color table entries supported\n", lcderr("ERROR: only %d color table entries supported\n",
STM32_DMA2D_NCLUT); STM32_DMA2D_NCLUT);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -1461,7 +1461,7 @@ static int stm32_dma2dgetclut(FAR struct dma2d_layer_s *layer,
return ret; return ret;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
#endif #endif
@@ -1491,7 +1491,7 @@ static int stm32_dma2dsetalpha(FAR struct dma2d_layer_s *layer, uint8_t alpha)
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, alpha=%02x\n", layer, alpha); lcdinfo("layer=%p, alpha=%02x\n", layer, alpha);
if (stm32_dma2d_lvalidate(priv)) if (stm32_dma2d_lvalidate(priv))
{ {
@@ -1502,7 +1502,7 @@ static int stm32_dma2dsetalpha(FAR struct dma2d_layer_s *layer, uint8_t alpha)
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1526,7 +1526,7 @@ static int stm32_dma2dgetalpha(FAR struct dma2d_layer_s *layer, uint8_t *alpha)
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, alpha=%p\n", layer, alpha); lcdinfo("layer=%p, alpha=%p\n", layer, alpha);
if (stm32_dma2d_lvalidate(priv)) if (stm32_dma2d_lvalidate(priv))
{ {
@@ -1537,7 +1537,7 @@ static int stm32_dma2dgetalpha(FAR struct dma2d_layer_s *layer, uint8_t *alpha)
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1577,7 +1577,7 @@ static int stm32_dma2dsetblendmode(FAR struct dma2d_layer_s *layer,
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, mode=%08x\n", layer, mode); lcdinfo("layer=%p, mode=%08x\n", layer, mode);
if (stm32_dma2d_lvalidate(priv)) if (stm32_dma2d_lvalidate(priv))
{ {
@@ -1588,7 +1588,7 @@ static int stm32_dma2dsetblendmode(FAR struct dma2d_layer_s *layer,
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1613,7 +1613,7 @@ static int stm32_dma2dgetblendmode(FAR struct dma2d_layer_s *layer,
{ {
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, mode=%p\n", layer, mode); lcdinfo("layer=%p, mode=%p\n", layer, mode);
if (stm32_dma2d_lvalidate(priv) && mode) if (stm32_dma2d_lvalidate(priv) && mode)
{ {
@@ -1624,7 +1624,7 @@ static int stm32_dma2dgetblendmode(FAR struct dma2d_layer_s *layer,
return OK; return OK;
} }
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
return -EINVAL; return -EINVAL;
} }
@@ -1661,8 +1661,8 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
FAR struct stm32_dma2d_s * destlayer = (FAR struct stm32_dma2d_s *)dest; FAR struct stm32_dma2d_s * destlayer = (FAR struct stm32_dma2d_s *)dest;
FAR struct stm32_dma2d_s * srclayer = (FAR struct stm32_dma2d_s *)src; FAR struct stm32_dma2d_s * srclayer = (FAR struct stm32_dma2d_s *)src;
ginfo("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n", lcdinfo("dest=%p, destxpos=%d, destypos=%d, src=%p, srcarea=%p\n",
dest, destxpos, destypos, src, srcarea); dest, destxpos, destypos, src, srcarea);
if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, srcarea) && if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, srcarea) &&
stm32_dma2d_lvalidatesize(srclayer, srcarea->xpos, stm32_dma2d_lvalidatesize(srclayer, srcarea->xpos,
@@ -1718,7 +1718,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
if (ret != OK) if (ret != OK)
{ {
ret = -ECANCELED; ret = -ECANCELED;
gerr("ERROR: Returning ECANCELED\n"); lcderr("ERROR: Returning ECANCELED\n");
} }
} }
@@ -1727,7 +1727,7 @@ static int stm32_dma2dblit(FAR struct dma2d_layer_s *dest,
else else
{ {
ret = -EINVAL; ret = -EINVAL;
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
} }
return ret; return ret;
@@ -1772,10 +1772,10 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
FAR struct stm32_dma2d_s * forelayer = (FAR struct stm32_dma2d_s *)fore; FAR struct stm32_dma2d_s * forelayer = (FAR struct stm32_dma2d_s *)fore;
FAR struct stm32_dma2d_s * backlayer = (FAR struct stm32_dma2d_s *)back; FAR struct stm32_dma2d_s * backlayer = (FAR struct stm32_dma2d_s *)back;
ginfo("dest=%p, destxpos=%d, destypos=%d, " lcdinfo("dest=%p, destxpos=%d, destypos=%d, "
"fore=%p, forexpos=%d, foreypos=%d, " "fore=%p, forexpos=%d, foreypos=%d, "
"back=%p, backarea=%p\n", "back=%p, backarea=%p\n",
dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea); dest, destxpos, destypos, fore, forexpos, foreypos, back, backarea);
if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, backarea) && if (stm32_dma2d_lvalidatesize(destlayer, destxpos, destypos, backarea) &&
stm32_dma2d_lvalidatesize(forelayer, forexpos, foreypos, backarea) && stm32_dma2d_lvalidatesize(forelayer, forexpos, foreypos, backarea) &&
@@ -1832,7 +1832,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
if (ret != OK) if (ret != OK)
{ {
ret = -ECANCELED; ret = -ECANCELED;
gerr("ERROR: Returning ECANCELED\n"); lcderr("ERROR: Returning ECANCELED\n");
} }
} }
@@ -1841,7 +1841,7 @@ static int stm32_dma2dblend(FAR struct dma2d_layer_s *dest,
else else
{ {
ret = -EINVAL; ret = -EINVAL;
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
} }
return ret; return ret;
@@ -1874,7 +1874,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
int ret; int ret;
FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer; FAR struct stm32_dma2d_s *priv = (FAR struct stm32_dma2d_s *)layer;
ginfo("layer=%p, area=%p, color=%08x\n", layer, area, color); lcdinfo("layer=%p, area=%p, color=%08x\n", layer, area, color);
if (stm32_dma2d_lvalidatesize(priv, area->xpos, area->ypos, area)) if (stm32_dma2d_lvalidatesize(priv, area->xpos, area->ypos, area))
{ {
@@ -1912,7 +1912,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
if (ret != OK) if (ret != OK)
{ {
ret = -ECANCELED; ret = -ECANCELED;
gerr("ERROR: Returning ECANCELED\n"); lcderr("ERROR: Returning ECANCELED\n");
} }
} }
@@ -1921,7 +1921,7 @@ static int stm32_dma2dfillarea(FAR struct dma2d_layer_s *layer,
else else
{ {
ret = -EINVAL; ret = -EINVAL;
gerr("ERROR: Returning EINVAL\n"); lcderr("ERROR: Returning EINVAL\n");
} }
return ret; return ret;
@@ -1954,7 +1954,7 @@ FAR struct dma2d_layer_s * up_dma2dgetlayer(int lid)
return &priv->dma2d; return &priv->dma2d;
} }
gerr("ERROR: EINVAL, Unknown layer identifier\n"); lcderr("ERROR: EINVAL, Unknown layer identifier\n");
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }
@@ -1989,7 +1989,7 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width,
uint8_t bpp = 0; uint8_t bpp = 0;
FAR struct stm32_dma2d_s *layer = NULL; FAR struct stm32_dma2d_s *layer = NULL;
ginfo("width=%d, height=%d, fmt=%02x \n", width, height, fmt); lcdinfo("width=%d, height=%d, fmt=%02x \n", width, height, fmt);
/* Validate if pixel format supported */ /* Validate if pixel format supported */
@@ -2069,19 +2069,19 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width,
/* free the layer struture */ /* free the layer struture */
kmm_free(layer); kmm_free(layer);
gerr("ERROR: ENOMEM, Unable to allocate layer buffer\n"); lcderr("ERROR: ENOMEM, Unable to allocate layer buffer\n");
errno = ENOMEM; errno = ENOMEM;
} }
} }
else else
{ {
gerr("ERROR: ENOMEM, unable to allocate layer structure\n"); lcderr("ERROR: ENOMEM, unable to allocate layer structure\n");
errno = ENOMEM; errno = ENOMEM;
} }
} }
else else
{ {
gerr("ERROR: EINVAL, no free layer available\n"); lcderr("ERROR: EINVAL, no free layer available\n");
errno = EINVAL; errno = EINVAL;
} }
@@ -2148,7 +2148,7 @@ int up_dma2dremovelayer(FAR struct dma2d_layer_s *layer)
int up_dma2dinitialize(void) int up_dma2dinitialize(void)
{ {
err("Initialize DMA2D driver\n"); lcdinfo("Initialize DMA2D driver\n");
if (g_initialized == false) if (g_initialized == false)
{ {
@@ -2265,15 +2265,15 @@ FAR struct dma2d_layer_s * stm32_dma2dinitltdc(FAR struct stm32_ltdc_s *layer)
uint8_t fmt = 0; uint8_t fmt = 0;
FAR struct stm32_ltdc_dma2d_s *priv; FAR struct stm32_ltdc_dma2d_s *priv;
ginfo("layer=%p\n", layer); lcdinfo("layer=%p\n", layer);
DEBUGASSERT(layer && layer->lid >= 0 && layer->lid < DMA2D_SHADOW_LAYER); DEBUGASSERT(layer && layer->lid >= 0 && layer->lid < DMA2D_SHADOW_LAYER);
ret = stm32_dma2d_pixelformat(layer->vinfo.fmt, &fmt); ret = stm32_dma2d_pixelformat(layer->vinfo.fmt, &fmt);
if (ret != OK) if (ret != OK)
{ {
err("Returning -EINVAL, unsupported pixel format: %d\n", lcderr("ERROR: Returning -EINVAL, unsupported pixel format: %d\n",
layer->vinfo.fmt); layer->vinfo.fmt);
errno = -EINVAL; errno = -EINVAL;
return NULL; return NULL;
} }
arch/arm/src/stm32/stm32_eth.c
+37 -37
View File
@@ -240,7 +240,7 @@
* enabled. * enabled.
*/ */
#ifndef CONFIG_DEBUG_FEATURES #ifndef CONFIG_DEBUG_NET_INFO
# undef CONFIG_STM32_ETHMAC_REGDEBUG # undef CONFIG_STM32_ETHMAC_REGDEBUG
#endif #endif
@@ -748,7 +748,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv);
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_ETHMAC_REGDEBUG
static uint32_t stm32_getreg(uint32_t addr) static uint32_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -769,7 +769,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); ninfo("...\n");
} }
return val; return val;
@@ -786,7 +786,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); ninfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -798,7 +798,7 @@ static uint32_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%08x\n", addr, val); ninfo("%08x->%08x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -820,12 +820,12 @@ static uint32_t stm32_getreg(uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_ETHMAC_REGDEBUG
static void stm32_putreg(uint32_t val, uint32_t addr) static void stm32_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%08x\n", addr, val); ninfo("%08x<-%08x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -847,7 +847,7 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_ETHMAC_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_ETHMAC_REGDEBUG
static void stm32_checksetup(void) static void stm32_checksetup(void)
{ {
} }
@@ -1505,7 +1505,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
if (!stm32_isfreebuffer(priv)) if (!stm32_isfreebuffer(priv))
{ {
nllerr("No free buffers\n"); nllerr("ERROR: No free buffers\n");
return -ENOMEM; return -ENOMEM;
} }
@@ -1612,7 +1612,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
* scanning logic, and continue scanning with the next frame. * scanning logic, and continue scanning with the next frame.
*/ */
nllerr("DROPPED: RX descriptor errors: %08x\n", rxdesc->rdes0); nllerr("ERROR: Dropped, RX descriptor errors: %08x\n", rxdesc->rdes0);
stm32_freesegment(priv, rxcurr, priv->segments); stm32_freesegment(priv, rxcurr, priv->segments);
} }
} }
@@ -1673,7 +1673,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
if (dev->d_len > CONFIG_NET_ETH_MTU) if (dev->d_len > CONFIG_NET_ETH_MTU)
{ {
nllerr("DROPPED: Too big: %d\n", dev->d_len); nllerr("ERROR: Dropped, Too big: %d\n", dev->d_len);
/* Free dropped packet buffer */ /* Free dropped packet buffer */
@@ -1793,7 +1793,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
else else
#endif #endif
{ {
nllerr("DROPPED: Unknown type: %04x\n", BUF->type); nllerr("ERROR: Dropped, Unknown type: %04x\n", BUF->type);
} }
/* We are finished with the RX buffer. NOTE: If the buffer is /* We are finished with the RX buffer. NOTE: If the buffer is
@@ -2042,7 +2042,7 @@ static inline void stm32_interrupt_process(FAR struct stm32_ethmac_s *priv)
{ {
/* Just let the user know what happened */ /* Just let the user know what happened */
nllerr("Abormal event(s): %08x\n", dmasr); nllninfoAbormal event(s): %08x\n", dmasr);
/* Clear all pending abnormal events */ /* Clear all pending abnormal events */
@@ -2246,7 +2246,7 @@ static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...)
{ {
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg; FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
nllerr("Timeout!\n"); nllninfoTimeout!\n");
#ifdef CONFIG_NET_NOINTS #ifdef CONFIG_NET_NOINTS
/* Disable further Ethernet interrupts. This will prevent some race /* Disable further Ethernet interrupts. This will prevent some race
@@ -2447,15 +2447,15 @@ static int stm32_ifup(struct net_driver_s *dev)
int ret; int ret;
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
nerr("Bringing up: %d.%d.%d.%d\n", ninfo("Bringing up: %d.%d.%d.%d\n",
dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
(dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24);
#endif #endif
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
nerr("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", ninfo("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2],
dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5], dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5],
dev->d_ipv6addr[6], dev->d_ipv6addr[7]); dev->d_ipv6addr[6], dev->d_ipv6addr[7]);
#endif #endif
/* Configure the Ethernet interface for DMA operation. */ /* Configure the Ethernet interface for DMA operation. */
@@ -2500,7 +2500,7 @@ static int stm32_ifdown(struct net_driver_s *dev)
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private; FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)dev->d_private;
irqstate_t flags; irqstate_t flags;
nerr("Taking the network down\n"); ninfo("Taking the network down\n");
/* Disable the Ethernet interrupt */ /* Disable the Ethernet interrupt */
@@ -3129,7 +3129,7 @@ static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *val
} }
} }
nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n", nerr("ERROR: MII transfer timed out: phydevaddr: %04x phyregaddr: %04x\n",
phydevaddr, phyregaddr); phydevaddr, phyregaddr);
return -ETIMEDOUT; return -ETIMEDOUT;
@@ -3188,7 +3188,7 @@ static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t val
} }
} }
nerr("MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n", nerr("ERROR: MII transfer timed out: phydevaddr: %04x phyregaddr: %04x value: %04x\n",
phydevaddr, phyregaddr, value); phydevaddr, phyregaddr, value);
return -ETIMEDOUT; return -ETIMEDOUT;
@@ -3225,7 +3225,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_PHYID1, &phyval); ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_PHYID1, &phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to read the PHY ID1: %d\n", ret); nerr("ERROR: Failed to read the PHY ID1: %d\n", ret);
return ret; return ret;
} }
@@ -3243,7 +3243,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
ret = stm32_phyread(CONFIG_STM32_PHYADDR, 16, &phyval); ret = stm32_phyread(CONFIG_STM32_PHYADDR, 16, &phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to read the PHY Register 0x10: %d\n", ret); nerr("ERROR: Failed to read the PHY Register 0x10: %d\n", ret);
return ret; return ret;
} }
@@ -3300,7 +3300,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_RESET); ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_RESET);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to reset the PHY: %d\n", ret); nerr("ERROR: Failed to reset the PHY: %d\n", ret);
return ret; return ret;
} }
up_mdelay(PHY_RESET_DELAY); up_mdelay(PHY_RESET_DELAY);
@@ -3311,7 +3311,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phy_boardinitialize(0); ret = stm32_phy_boardinitialize(0);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to initialize the PHY: %d\n", ret); nerr("ERROR: Failed to initialize the PHY: %d\n", ret);
return ret; return ret;
} }
#endif #endif
@@ -3336,7 +3336,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval); ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to read the PHY MSR: %d\n", ret); nerr("ERROR: Failed to read the PHY MSR: %d\n", ret);
return ret; return ret;
} }
else if ((phyval & MII_MSR_LINKSTATUS) != 0) else if ((phyval & MII_MSR_LINKSTATUS) != 0)
@@ -3347,7 +3347,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
if (timeout >= PHY_RETRY_TIMEOUT) if (timeout >= PHY_RETRY_TIMEOUT)
{ {
nerr("Timed out waiting for link status: %04x\n", phyval); nerr("ERROR: Timed out waiting for link status: %04x\n", phyval);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@@ -3356,7 +3356,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_ANENABLE); ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, MII_MCR_ANENABLE);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to enable auto-negotiation: %d\n", ret); nerr("ERROR: Failed to enable auto-negotiation: %d\n", ret);
return ret; return ret;
} }
@@ -3367,7 +3367,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval); ret = stm32_phyread(CONFIG_STM32_PHYADDR, MII_MSR, &phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to read the PHY MSR: %d\n", ret); nerr("ERROR: Failed to read the PHY MSR: %d\n", ret);
return ret; return ret;
} }
else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0) else if ((phyval & MII_MSR_ANEGCOMPLETE) != 0)
@@ -3378,7 +3378,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
if (timeout >= PHY_RETRY_TIMEOUT) if (timeout >= PHY_RETRY_TIMEOUT)
{ {
nerr("Timed out waiting for auto-negotiation\n"); nerr("ERROR: Timed out waiting for auto-negotiation\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@@ -3387,7 +3387,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phyread(CONFIG_STM32_PHYADDR, CONFIG_STM32_PHYSR, &phyval); ret = stm32_phyread(CONFIG_STM32_PHYADDR, CONFIG_STM32_PHYSR, &phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to read PHY status register\n"); nerr("ERROR: Failed to read PHY status register\n");
return ret; return ret;
} }
@@ -3457,7 +3457,7 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, phyval); ret = stm32_phywrite(CONFIG_STM32_PHYADDR, MII_MCR, phyval);
if (ret < 0) if (ret < 0)
{ {
nerr("Failed to write the PHY MCR: %d\n", ret); nerr("ERROR: Failed to write the PHY MCR: %d\n", ret);
return ret; return ret;
} }
up_mdelay(PHY_CONFIG_DELAY); up_mdelay(PHY_CONFIG_DELAY);
@@ -3472,9 +3472,9 @@ static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
#endif #endif
#endif #endif
nerr("Duplex: %s Speed: %d MBps\n", ninfo("Duplex: %s Speed: %d MBps\n",
priv->fduplex ? "FULL" : "HALF", priv->fduplex ? "FULL" : "HALF",
priv->mbps100 ? 100 : 10); priv->mbps100 ? 100 : 10);
return OK; return OK;
} }
arch/arm/src/stm32/stm32_i2c.c
+3 -3
View File
@@ -850,7 +850,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv, uint32_t statu
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -891,7 +891,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -1686,7 +1686,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
status = stm32_i2c_getstatus(priv); status = stm32_i2c_getstatus(priv);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
i2cerr("Timed out: CR1: 0x%04x status: 0x%08x\n", i2cerr("ERROR: Timed out: CR1: 0x%04x status: 0x%08x\n",
stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status); stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
/* "Note: When the STOP, START or PEC bit is set, the software must /* "Note: When the STOP, START or PEC bit is set, the software must
arch/arm/src/stm32/stm32_i2c_alt.c
+13 -12
View File
@@ -858,7 +858,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv, uint16_t statu
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -899,7 +899,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -1373,7 +1373,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
{ {
/* TODO: untested!! */ /* TODO: untested!! */
i2cerr(" An empty message has been detected, ignoring and passing to next message.\n"); i2cwarn("WARNING: An empty message has been detected, ignoring and passing to next message.\n");
/* Trace event */ /* Trace event */
@@ -1600,14 +1600,14 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
} }
else else
{ {
i2cerr("Write mode: next message has an unrecognized flag.\n"); i2cerr("ERROR: Write mode: next message has an unrecognized flag.\n");
stm32_i2c_traceevent(priv, I2CEVENT_WRITE_FLAG_ERROR, priv->msgv->flags); stm32_i2c_traceevent(priv, I2CEVENT_WRITE_FLAG_ERROR, priv->msgv->flags);
} }
} }
else else
{ {
i2cerr("Write mode error.\n"); i2cerr("ERROR: Write mode error.\n");
stm32_i2c_traceevent(priv, I2CEVENT_WRITE_ERROR, 0); stm32_i2c_traceevent(priv, I2CEVENT_WRITE_ERROR, 0);
} }
} }
@@ -1774,8 +1774,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
else else
{ {
i2cerr("I2C read mode no correct state detected\n"); i2cerr("ERROR: I2C read mode no correct state detected\n");
i2cerr(" state %i, dcnt=%i\n", status, priv->dcnt); i2cerr(" state %i, dcnt=%i\n", status, priv->dcnt);
/* set condition to terminate ISR and wake waiting thread */ /* set condition to terminate ISR and wake waiting thread */
@@ -1800,7 +1800,7 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
/* Read rest of the state */ /* Read rest of the state */
status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16); status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
i2cerr("Empty call to ISR: Stopping ISR\n"); i2cwarn("WARNING: Empty call to ISR: Stopping ISR\n");
stm32_i2c_traceevent(priv, I2CEVENT_ISR_EMPTY_CALL, 0); stm32_i2c_traceevent(priv, I2CEVENT_ISR_EMPTY_CALL, 0);
} }
@@ -1824,8 +1824,8 @@ static int stm32_i2c_isr(struct stm32_i2c_priv_s *priv)
status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16); status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
i2cerr(" No correct state detected(start bit, read or write) \n"); i2cerr("ERROR: No correct state detected(start bit, read or write) \n");
i2cerr(" state %i\n", status); i2cerr(" state %i\n", status);
/* set condition to terminate ISR and wake waiting thread */ /* set condition to terminate ISR and wake waiting thread */
@@ -2117,7 +2117,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
status = stm32_i2c_getstatus(priv); status = stm32_i2c_getstatus(priv);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
i2cerr("Timed out: CR1: 0x%04x status: 0x%08x\n", i2cerr("ERROR: Timed out: CR1: 0x%04x status: 0x%08x\n",
stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status); stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
/* "Note: When the STOP, START or PEC bit is set, the software must /* "Note: When the STOP, START or PEC bit is set, the software must
@@ -2147,7 +2147,8 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
* Note: this commentary is found in both places. * Note: this commentary is found in both places.
* *
*/ */
i2cerr("Check if the address was valid\n");
i2cinfo("Check if the address was valid\n");
stm32_i2c_sendstop(priv); stm32_i2c_sendstop(priv);
#endif #endif
/* Clear busy flag in case of timeout */ /* Clear busy flag in case of timeout */
arch/arm/src/stm32/stm32_iwdg.c
+13 -9
View File
@@ -84,6 +84,10 @@
# define CONFIG_STM32_IWDG_DEFTIMOUT IWDG_MAXTIMEOUT # define CONFIG_STM32_IWDG_DEFTIMOUT IWDG_MAXTIMEOUT
#endif #endif
#ifndef CONFIG_DEBUG_WATCHDOG_INFO
# undef CONFIG_STM32_IWDG_REGDEBUG
#endif
/* REVISIT: It appears that you can only setup the prescaler and reload /* REVISIT: It appears that you can only setup the prescaler and reload
* registers once. After that, the SR register's PVU and RVU bits never go * registers once. After that, the SR register's PVU and RVU bits never go
* to zero. So we defer setting up these registers until the watchdog * to zero. So we defer setting up these registers until the watchdog
@@ -129,7 +133,7 @@ struct stm32_lowerhalf_s
****************************************************************************/ ****************************************************************************/
/* Register operations ******************************************************/ /* Register operations ******************************************************/
#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_IWDG_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr); static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr); static void stm32_putreg(uint16_t val, uint32_t addr);
#else #else
@@ -181,7 +185,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_IWDG_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr) static uint16_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -202,7 +206,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); wdinfo("...\n");
} }
return val; return val;
@@ -219,7 +223,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); wdinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -231,7 +235,7 @@ static uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%04x\n", addr, val); wdinfo("%08x->%04x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -244,12 +248,12 @@ static uint16_t stm32_getreg(uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_IWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_IWDG_REGDEBUG
static void stm32_putreg(uint16_t val, uint32_t addr) static void stm32_putreg(uint16_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%04x\n", addr, val); wdinfo("%08x<-%04x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -509,7 +513,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
if (timeout < 1 || timeout > IWDG_MAXTIMEOUT) if (timeout < 1 || timeout > IWDG_MAXTIMEOUT)
{ {
wderr("Cannot represent timeout=%d > %d\n", wderr("ERROR: Cannot represent timeout=%d > %d\n",
timeout, IWDG_MAXTIMEOUT); timeout, IWDG_MAXTIMEOUT);
return -ERANGE; return -ERANGE;
} }
@@ -522,7 +526,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
#ifdef CONFIG_STM32_IWDG_ONETIMESETUP #ifdef CONFIG_STM32_IWDG_ONETIMESETUP
if (priv->started) if (priv->started)
{ {
wderr("Timer is already started\n"); wdwarn("WARNING: Timer is already started\n");
return -EBUSY; return -EBUSY;
} }
#endif #endif
arch/arm/src/stm32/stm32_ltdc.c
+110 -96
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/stm32/stm32_otgfsdev.c
+17 -13
View File
@@ -81,6 +81,10 @@
# define CONFIG_USBDEV_MAXPOWER 100 /* mA */ # define CONFIG_USBDEV_MAXPOWER 100 /* mA */
#endif #endif
#ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_STM32_USBDEV_REGDEBUG
#endif
/* There is 1.25Kb of FIFO memory. The default partitions this memory /* There is 1.25Kb of FIFO memory. The default partitions this memory
* so that there is a TxFIFO allocated for each endpoint and with more * so that there is a TxFIFO allocated for each endpoint and with more
* memory provided for the common RxFIFO. A more knowledge-able * memory provided for the common RxFIFO. A more knowledge-able
@@ -472,7 +476,7 @@ struct stm32_usbdev_s
/* Register operations ********************************************************/ /* Register operations ********************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint32_t stm32_getreg(uint32_t addr); static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr); static void stm32_putreg(uint32_t val, uint32_t addr);
#else #else
@@ -792,7 +796,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint32_t stm32_getreg(uint32_t addr) static uint32_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -813,7 +817,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); usbinfo("...\n");
} }
return val; return val;
@@ -830,7 +834,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); usbinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -842,7 +846,7 @@ static uint32_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%08x\n", addr, val); usbinfo("%08x->%08x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -855,12 +859,12 @@ static uint32_t stm32_getreg(uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static void stm32_putreg(uint32_t val, uint32_t addr) static void stm32_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%08x\n", addr, val); usbinfo("%08x<-%08x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -2625,7 +2629,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno)); regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno));
ullerr("DOEPINT(%d) = %08x\n", epno, regval); ullinfo("DOEPINT(%d) = %08x\n", epno, regval);
stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno)); stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno));
} }
@@ -2855,8 +2859,8 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
{ {
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
ullerr("DIEPINT(%d) = %08x\n", ullinfo("DIEPINT(%d) = %08x\n",
epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno))); epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno)));
stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno)); stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno));
} }
@@ -3801,7 +3805,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
uerr("Unsupported maxpacket: %d\n", maxpacket); uerr("ERROR: Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@@ -3896,7 +3900,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
uerr("Unsupported maxpacket: %d\n", maxpacket); uerr("ERROR: Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@@ -5447,7 +5451,7 @@ void up_usbinitialize(void)
ret = irq_attach(STM32_IRQ_OTGFS, stm32_usbinterrupt); ret = irq_attach(STM32_IRQ_OTGFS, stm32_usbinterrupt);
if (ret < 0) if (ret < 0)
{ {
uerr("irq_attach failed\n", ret); uerr("ERROR: irq_attach failed\n", ret);
goto errout; goto errout;
} }
arch/arm/src/stm32/stm32_otgfshost.c
+3 -3
View File
@@ -130,7 +130,7 @@
/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */ /* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
#ifndef CONFIG_DEBUG_FEATURES #ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_STM32_USBHOST_REGDEBUG # undef CONFIG_STM32_USBHOST_REGDEBUG
# undef CONFIG_STM32_USBHOST_PKTDUMP # undef CONFIG_STM32_USBHOST_PKTDUMP
#endif #endif
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
#ifdef CONFIG_STM32_USBHOST_REGDEBUG #ifdef CONFIG_STM32_USBHOST_REGDEBUG
static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite) static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
{ {
llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); usbinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
} }
#endif #endif
@@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
{ {
/* No.. More than one. */ /* No.. More than one. */
llerr("[repeats %d more times]\n", count); usbinfo("[repeats %d more times]\n", count);
} }
} }
arch/arm/src/stm32/stm32_otghsdev.c
+16 -12
View File
@@ -81,6 +81,10 @@
# define CONFIG_USBDEV_MAXPOWER 100 /* mA */ # define CONFIG_USBDEV_MAXPOWER 100 /* mA */
#endif #endif
#ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_STM32_USBDEV_REGDEBUG
#endif
/* There is 1.25Kb of FIFO memory. The default partitions this memory /* There is 1.25Kb of FIFO memory. The default partitions this memory
* so that there is a TxFIFO allocated for each endpoint and with more * so that there is a TxFIFO allocated for each endpoint and with more
* memory provided for the common RxFIFO. A more knowledge-able * memory provided for the common RxFIFO. A more knowledge-able
@@ -472,7 +476,7 @@ struct stm32_usbdev_s
/* Register operations ********************************************************/ /* Register operations ********************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint32_t stm32_getreg(uint32_t addr); static uint32_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint32_t val, uint32_t addr); static void stm32_putreg(uint32_t val, uint32_t addr);
#else #else
@@ -792,7 +796,7 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint32_t stm32_getreg(uint32_t addr) static uint32_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -813,7 +817,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); usbinfo("...\n");
} }
return val; return val;
@@ -830,7 +834,7 @@ static uint32_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); usbinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -842,7 +846,7 @@ static uint32_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%08x\n", addr, val); usbinfo("%08x->%08x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -855,12 +859,12 @@ static uint32_t stm32_getreg(uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static void stm32_putreg(uint32_t val, uint32_t addr) static void stm32_putreg(uint32_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%08x\n", addr, val); usbinfo("%08x<-%08x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -2625,7 +2629,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
regval = stm32_getreg(STM32_OTGHS_DOEPINT(epno)); regval = stm32_getreg(STM32_OTGHS_DOEPINT(epno));
ullerr("DOEPINT(%d) = %08x\n", epno, regval); ulinfo("("DOEPINT(%d) = %08x\n", epno, regval);
stm32_putreg(0xFF, STM32_OTGHS_DOEPINT(epno)); stm32_putreg(0xFF, STM32_OTGHS_DOEPINT(epno));
} }
@@ -2855,7 +2859,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
{ {
if ((daint & 1) != 0) if ((daint & 1) != 0)
{ {
ullerr("DIEPINT(%d) = %08x\n", ulinfo("("DIEPINT(%d) = %08x\n",
epno, stm32_getreg(STM32_OTGHS_DIEPINT(epno))); epno, stm32_getreg(STM32_OTGHS_DIEPINT(epno)));
stm32_putreg(0xFF, STM32_OTGHS_DIEPINT(epno)); stm32_putreg(0xFF, STM32_OTGHS_DIEPINT(epno));
} }
@@ -3801,7 +3805,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
uerr("Unsupported maxpacket: %d\n", maxpacket); uerr("ERROR: Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@@ -3896,7 +3900,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
break; break;
default: default:
uerr("Unsupported maxpacket: %d\n", maxpacket); uerr("ERROR: Unsupported maxpacket: %d\n", maxpacket);
return -EINVAL; return -EINVAL;
} }
} }
@@ -5436,7 +5440,7 @@ void up_usbinitialize(void)
ret = irq_attach(STM32_IRQ_OTGHS, stm32_usbinterrupt); ret = irq_attach(STM32_IRQ_OTGHS, stm32_usbinterrupt);
if (ret < 0) if (ret < 0)
{ {
uerr("irq_attach failed\n", ret); uerr("ERROR: irq_attach failed\n", ret);
goto errout; goto errout;
} }
arch/arm/src/stm32/stm32_otghshost.c
+3 -3
View File
@@ -130,7 +130,7 @@
/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */ /* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
#ifndef CONFIG_DEBUG_FEATURES #ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_STM32_USBHOST_REGDEBUG # undef CONFIG_STM32_USBHOST_REGDEBUG
# undef CONFIG_STM32_USBHOST_PKTDUMP # undef CONFIG_STM32_USBHOST_PKTDUMP
#endif #endif
@@ -506,7 +506,7 @@ static struct usbhost_connection_s g_usbconn =
#ifdef CONFIG_STM32_USBHOST_REGDEBUG #ifdef CONFIG_STM32_USBHOST_REGDEBUG
static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite) static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
{ {
llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val); usbinfo("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
} }
#endif #endif
@@ -556,7 +556,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
{ {
/* No.. More than one. */ /* No.. More than one. */
llerr("[repeats %d more times]\n", count); usbinfo("[repeats %d more times]\n", count);
} }
} }
arch/arm/src/stm32/stm32_pwm.c
+6 -6
View File
@@ -1190,7 +1190,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
break; break;
default: default:
pwmerr("No such timer mode: %u\n", (unsigned int)priv->mode); pwmerr("ERROR: No such timer mode: %u\n", (unsigned int)priv->mode);
return -EINVAL; return -EINVAL;
} }
} }
@@ -1317,7 +1317,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
if (j >= PWM_NCHANNELS) if (j >= PWM_NCHANNELS)
{ {
pwmerr("No such channel: %u\n", channel); pwmerr("ERROR: No such channel: %u\n", channel);
return -EINVAL; return -EINVAL;
} }
#else #else
@@ -1368,7 +1368,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
#endif #endif
default: default:
pwmerr("No such mode: %u\n", (unsigned int)mode); pwmerr("ERROR: No such mode: %u\n", (unsigned int)mode);
return -EINVAL; return -EINVAL;
} }
@@ -1475,7 +1475,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
break; break;
default: default:
pwmerr("No such channel: %u\n", channel); pwmerr("ERROR: No such channel: %u\n", channel);
return -EINVAL; return -EINVAL;
} }
} }
@@ -1688,7 +1688,7 @@ static int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
break; break;
default: default:
pwmerr("No such channel: %u\n", channel); pwmerr("ERROR: No such channel: %u\n", channel);
return -EINVAL; return -EINVAL;
} }
@@ -2508,7 +2508,7 @@ FAR struct pwm_lowerhalf_s *stm32_pwminitialize(int timer)
#endif #endif
default: default:
pwmerr("No such timer configured\n"); pwmerr("ERROR: No such timer configured\n");
return NULL; return NULL;
} }
arch/arm/src/stm32/stm32_qencoder.c
+3 -3
View File
@@ -1270,7 +1270,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
priv = stm32_tim2lower(tim); priv = stm32_tim2lower(tim);
if (!priv) if (!priv)
{ {
snerr("TIM%d support not configured\n", tim); snerr("ERROR: TIM%d support not configured\n", tim);
return -ENXIO; return -ENXIO;
} }
@@ -1278,7 +1278,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
if (priv->inuse) if (priv->inuse)
{ {
snerr("TIM%d is in-used\n", tim); snerr("ERROR: TIM%d is in-use\n", tim);
return -EBUSY; return -EBUSY;
} }
@@ -1287,7 +1287,7 @@ int stm32_qeinitialize(FAR const char *devpath, int tim)
ret = qe_register(devpath, (FAR struct qe_lowerhalf_s *)priv); ret = qe_register(devpath, (FAR struct qe_lowerhalf_s *)priv);
if (ret < 0) if (ret < 0)
{ {
snerr("qe_register failed: %d\n", ret); snerr("ERROR: qe_register failed: %d\n", ret);
return ret; return ret;
} }
arch/arm/src/stm32/stm32_rtcc.c
+5 -5
View File
@@ -711,13 +711,13 @@ int up_rtc_initialize(void)
{ {
case OK: case OK:
{ {
rtcllerr("rtc_syncwait() okay\n"); rtcllinfo("rtc_syncwait() okay\n");
break; break;
} }
default: default:
{ {
rtcllerr("rtc_syncwait() failed (%d)\n", ret); rtcllerr("ERROR: rtc_syncwait() failed (%d)\n", ret);
break; break;
} }
} }
@@ -731,7 +731,7 @@ int up_rtc_initialize(void)
if (regval != RTC_MAGIC) if (regval != RTC_MAGIC)
{ {
rtcllerr("Do setup\n"); rtcllinfo("Do setup\n");
/* Perform the one-time setup of the LSE clocking to the RTC */ /* Perform the one-time setup of the LSE clocking to the RTC */
@@ -749,7 +749,7 @@ int up_rtc_initialize(void)
} }
else else
{ {
rtcllerr("Do resume\n"); rtcllinfo("Do resume\n");
/* RTC already set-up, just resume normal operation */ /* RTC already set-up, just resume normal operation */
@@ -765,7 +765,7 @@ int up_rtc_initialize(void)
if (ret != OK && nretry > 0) if (ret != OK && nretry > 0)
{ {
rtcllerr("setup/resume ran %d times and failed with %d\n", rtcllinfo("setup/resume ran %d times and failed with %d\n",
nretry, ret); nretry, ret);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
arch/arm/src/stm32/stm32_sdio.c
+48 -47
View File
@@ -139,7 +139,7 @@
# undef CONFIG_SDIO_DMAPRIO # undef CONFIG_SDIO_DMAPRIO
#endif #endif
#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES) #ifndef CONFIG_DEBUG_MEMCARD_INFO
# undef CONFIG_SDIO_XFRDEBUG # undef CONFIG_SDIO_XFRDEBUG
#endif #endif
@@ -596,7 +596,7 @@ static inline void stm32_setclkcr(uint32_t clkcr)
regval |= clkcr; regval |= clkcr;
putreg32(regval, STM32_SDIO_CLKCR); putreg32(regval, STM32_SDIO_CLKCR);
finfo("CLKCR: %08x PWR: %08x\n", mcinfo("CLKCR: %08x PWR: %08x\n",
getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER)); getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER));
} }
@@ -812,16 +812,16 @@ static void stm32_sample(struct stm32_dev_s *priv, int index)
#ifdef CONFIG_SDIO_XFRDEBUG #ifdef CONFIG_SDIO_XFRDEBUG
static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg) static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg)
{ {
ferr("SDIO Registers: %s\n", msg); mcinfo("SDIO Registers: %s\n", msg);
ferr(" POWER[%08x]: %08x\n", STM32_SDIO_POWER, regs->power); mcinfo(" POWER[%08x]: %08x\n", STM32_SDIO_POWER, regs->power);
ferr(" CLKCR[%08x]: %08x\n", STM32_SDIO_CLKCR, regs->clkcr); mcinfo(" CLKCR[%08x]: %08x\n", STM32_SDIO_CLKCR, regs->clkcr);
ferr(" DCTRL[%08x]: %08x\n", STM32_SDIO_DCTRL, regs->dctrl); mcinfo(" DCTRL[%08x]: %08x\n", STM32_SDIO_DCTRL, regs->dctrl);
ferr(" DTIMER[%08x]: %08x\n", STM32_SDIO_DTIMER, regs->dtimer); mcinfo(" DTIMER[%08x]: %08x\n", STM32_SDIO_DTIMER, regs->dtimer);
ferr(" DLEN[%08x]: %08x\n", STM32_SDIO_DLEN, regs->dlen); mcinfo(" DLEN[%08x]: %08x\n", STM32_SDIO_DLEN, regs->dlen);
ferr(" DCOUNT[%08x]: %08x\n", STM32_SDIO_DCOUNT, regs->dcount); mcinfo(" DCOUNT[%08x]: %08x\n", STM32_SDIO_DCOUNT, regs->dcount);
ferr(" STA[%08x]: %08x\n", STM32_SDIO_STA, regs->sta); mcinfo(" STA[%08x]: %08x\n", STM32_SDIO_STA, regs->sta);
ferr(" MASK[%08x]: %08x\n", STM32_SDIO_MASK, regs->mask); mcinfo(" MASK[%08x]: %08x\n", STM32_SDIO_MASK, regs->mask);
ferr("FIFOCNT[%08x]: %08x\n", STM32_SDIO_FIFOCNT, regs->fifocnt); mcinfo("FIFOCNT[%08x]: %08x\n", STM32_SDIO_FIFOCNT, regs->fifocnt);
} }
#endif #endif
@@ -907,7 +907,7 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg)
if ((status & DMA_STATUS_ERROR) != 0) if ((status & DMA_STATUS_ERROR) != 0)
{ {
fllerr("DMA error %02x, remaining: %d\n", status, priv->remaining); mcllerr("ERROR: DMA error %02x, remaining: %d\n", status, priv->remaining);
result = SDIOWAIT_ERROR; result = SDIOWAIT_ERROR;
} }
else else
@@ -1172,7 +1172,7 @@ static void stm32_eventtimeout(int argc, uint32_t arg)
/* Yes.. wake up any waiting threads */ /* Yes.. wake up any waiting threads */
stm32_endwait(priv, SDIOWAIT_TIMEOUT); stm32_endwait(priv, SDIOWAIT_TIMEOUT);
fllerr("Timeout: remaining: %d\n", priv->remaining); mcllerr("ERROR: Timeout, remaining: %d\n", priv->remaining);
} }
} }
@@ -1412,7 +1412,7 @@ static int stm32_interrupt(int irq, void *context)
{ {
/* Terminate the transfer with an error */ /* Terminate the transfer with an error */
fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); mcllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
} }
@@ -1422,7 +1422,7 @@ static int stm32_interrupt(int irq, void *context)
{ {
/* Terminate the transfer with an error */ /* Terminate the transfer with an error */
fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining); mcllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT);
} }
@@ -1432,7 +1432,7 @@ static int stm32_interrupt(int irq, void *context)
{ {
/* Terminate the transfer with an error */ /* Terminate the transfer with an error */
fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); mcllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
} }
@@ -1442,7 +1442,7 @@ static int stm32_interrupt(int irq, void *context)
{ {
/* Terminate the transfer with an error */ /* Terminate the transfer with an error */
fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); mcllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
} }
@@ -1452,7 +1452,7 @@ static int stm32_interrupt(int irq, void *context)
{ {
/* Terminate the transfer with an error */ /* Terminate the transfer with an error */
fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining); mcllerr("ERROR: Start bit, remaining: %d\n", priv->remaining);
stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
} }
} }
@@ -1588,8 +1588,8 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON); stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON);
leave_critical_section(flags); leave_critical_section(flags);
finfo("CLCKR: %08x POWER: %08x\n", mcinfo("CLCKR: %08x POWER: %08x\n",
getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER)); getreg32(STM32_SDIO_CLKCR), getreg32(STM32_SDIO_POWER));
} }
/**************************************************************************** /****************************************************************************
@@ -1801,7 +1801,7 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT; cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
regval |= cmdidx | SDIO_CMD_CPSMEN; regval |= cmdidx | SDIO_CMD_CPSMEN;
finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); mcinfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
/* Write the SDIO CMD */ /* Write the SDIO CMD */
@@ -2031,7 +2031,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
{ {
if (--timeout <= 0) if (--timeout <= 0)
{ {
ferr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n", mcerr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
cmd, events, getreg32(STM32_SDIO_STA)); cmd, events, getreg32(STM32_SDIO_STA));
return -ETIMEDOUT; return -ETIMEDOUT;
@@ -2066,7 +2066,7 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
{ {
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_MEMCARD_INFO
uint32_t respcmd; uint32_t respcmd;
#endif #endif
uint32_t regval; uint32_t regval;
@@ -2095,10 +2095,10 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
*/ */
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_MEMCARD_INFO
if (!rshort) if (!rshort)
{ {
ferr("ERROR: rshort=NULL\n"); mcerr("ERROR: rshort=NULL\n");
ret = -EINVAL; ret = -EINVAL;
} }
@@ -2108,7 +2108,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE && (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE) (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE)
{ {
ferr("ERROR: Wrong response CMD=%08x\n", cmd); mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -2119,15 +2119,15 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
regval = getreg32(STM32_SDIO_STA); regval = getreg32(STM32_SDIO_STA);
if ((regval & SDIO_STA_CTIMEOUT) != 0) if ((regval & SDIO_STA_CTIMEOUT) != 0)
{ {
ferr("ERROR: Command timeout: %08x\n", regval); mcerr("ERROR: Command timeout: %08x\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if ((regval & SDIO_STA_CCRCFAIL) != 0) else if ((regval & SDIO_STA_CCRCFAIL) != 0)
{ {
ferr("ERROR: CRC failure: %08x\n", regval); mcerr("ERROR: CRC failure: %08x\n", regval);
ret = -EIO; ret = -EIO;
} }
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_MEMCARD_INFO
else else
{ {
/* Check response received is of desired command */ /* Check response received is of desired command */
@@ -2135,7 +2135,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
respcmd = getreg32(STM32_SDIO_RESPCMD); respcmd = getreg32(STM32_SDIO_RESPCMD);
if ((uint8_t)(respcmd & SDIO_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK)) if ((uint8_t)(respcmd & SDIO_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK))
{ {
ferr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd); mcerr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
ret = -EINVAL; ret = -EINVAL;
} }
} }
@@ -2163,12 +2163,12 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
* 0 1 End bit * 0 1 End bit
*/ */
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_MEMCARD_INFO
/* Check that R1 is the correct response to this command */ /* Check that R1 is the correct response to this command */
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE) if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE)
{ {
ferr("ERROR: Wrong response CMD=%08x\n", cmd); mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -2179,12 +2179,12 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
regval = getreg32(STM32_SDIO_STA); regval = getreg32(STM32_SDIO_STA);
if (regval & SDIO_STA_CTIMEOUT) if (regval & SDIO_STA_CTIMEOUT)
{ {
ferr("ERROR: Timeout STA: %08x\n", regval); mcerr("ERROR: Timeout STA: %08x\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
else if (regval & SDIO_STA_CCRCFAIL) else if (regval & SDIO_STA_CCRCFAIL)
{ {
ferr("ERROR: CRC fail STA: %08x\n", regval); mcerr("ERROR: CRC fail STA: %08x\n", regval);
ret = -EIO; ret = -EIO;
} }
} }
@@ -2218,11 +2218,11 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
/* Check that this is the correct response to this command */ /* Check that this is the correct response to this command */
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_MEMCARD_INFO
if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE && if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE &&
(cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE) (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE)
{ {
ferr("ERROR: Wrong response CMD=%08x\n", cmd); mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
ret = -EINVAL; ret = -EINVAL;
} }
else else
@@ -2235,7 +2235,7 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
regval = getreg32(STM32_SDIO_STA); regval = getreg32(STM32_SDIO_STA);
if (regval & SDIO_STA_CTIMEOUT) if (regval & SDIO_STA_CTIMEOUT)
{ {
ferr("ERROR: Timeout STA: %08x\n", regval); mcerr("ERROR: Timeout STA: %08x\n", regval);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
} }
} }
@@ -2390,7 +2390,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev,
1, (uint32_t)priv); 1, (uint32_t)priv);
if (ret != OK) if (ret != OK)
{ {
ferr("ERROR: wd_start failed: %d\n", ret); mcerr("ERROR: wd_start failed: %d\n", ret);
} }
} }
@@ -2477,7 +2477,7 @@ static void stm32_callbackenable(FAR struct sdio_dev_s *dev,
{ {
struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
finfo("eventset: %02x\n", eventset); mcinfo("eventset: %02x\n", eventset);
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
priv->cbevents = eventset; priv->cbevents = eventset;
@@ -2513,7 +2513,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
/* Disable callbacks and register this callback and is argument */ /* Disable callbacks and register this callback and is argument */
finfo("Register %p(%p)\n", callback, arg); mcinfo("Register %p(%p)\n", callback, arg);
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
priv->cbevents = 0; priv->cbevents = 0;
@@ -2749,8 +2749,8 @@ static void stm32_callback(void *arg)
/* Is a callback registered? */ /* Is a callback registered? */
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", mcinfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
if (priv->callback) if (priv->callback)
{ {
@@ -2794,14 +2794,14 @@ static void stm32_callback(void *arg)
{ {
/* Yes.. queue it */ /* Yes.. queue it */
finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg); mcinfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
(void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0); (void)work_queue(HPWORK, &priv->cbwork, (worker_t)priv->callback, priv->cbarg, 0);
} }
else else
{ {
/* No.. then just call the callback here */ /* No.. then just call the callback here */
finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); mcinfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
priv->callback(priv->cbarg); priv->callback(priv->cbarg);
} }
} }
@@ -2931,7 +2931,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
leave_critical_section(flags); leave_critical_section(flags);
finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); mcinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
/* Perform any requested callback if the status has changed */ /* Perform any requested callback if the status has changed */
@@ -2973,7 +2973,8 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
{ {
priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
} }
finfo("cdstatus: %02x\n", priv->cdstatus);
mcinfo("cdstatus: %02x\n", priv->cdstatus);
leave_critical_section(flags); leave_critical_section(flags);
} }
#endif /* CONFIG_STM32_SDIO */ #endif /* CONFIG_STM32_SDIO */
arch/arm/src/stm32/stm32_usbdev.c
+38 -37
View File
@@ -103,7 +103,7 @@
* enabled. * enabled.
*/ */
#ifndef CONFIG_DEBUG_FEATURES #ifndef CONFIG_DEBUG_USB_INFO
# undef CONFIG_STM32_USBDEV_REGDEBUG # undef CONFIG_STM32_USBDEV_REGDEBUG
#endif #endif
@@ -388,7 +388,7 @@ struct stm32_usbdev_s
/* Register operations ******************************************************/ /* Register operations ******************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr); static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr); static void stm32_putreg(uint16_t val, uint32_t addr);
static void stm32_checksetup(void); static void stm32_checksetup(void);
@@ -648,11 +648,12 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
/**************************************************************************** /****************************************************************************
* Register Operations * Register Operations
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* Name: stm32_getreg * Name: stm32_getreg
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr) static uint16_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -673,7 +674,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); usbinfo("...\n");
} }
return val; return val;
} }
@@ -689,7 +690,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); usbinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -701,7 +702,7 @@ static uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%04x\n", addr, val); usbinfo("%08x->%04x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -710,12 +711,12 @@ static uint16_t stm32_getreg(uint32_t addr)
* Name: stm32_putreg * Name: stm32_putreg
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static void stm32_putreg(uint16_t val, uint32_t addr) static void stm32_putreg(uint16_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%04x\n", addr, val); usbinfo("%08x<-%04x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -727,42 +728,42 @@ static void stm32_putreg(uint16_t val, uint32_t addr)
* Name: stm32_dumpep * Name: stm32_dumpep
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static void stm32_dumpep(int epno) static void stm32_dumpep(int epno)
{ {
uint32_t addr; uint32_t addr;
/* Common registers */ /* Common registers */
llerr("CNTR: %04x\n", getreg16(STM32_USB_CNTR)); usbinfo("CNTR: %04x\n", getreg16(STM32_USB_CNTR));
llerr("ISTR: %04x\n", getreg16(STM32_USB_ISTR)); usbinfo("ISTR: %04x\n", getreg16(STM32_USB_ISTR));
llerr("FNR: %04x\n", getreg16(STM32_USB_FNR)); usbinfo("FNR: %04x\n", getreg16(STM32_USB_FNR));
llerr("DADDR: %04x\n", getreg16(STM32_USB_DADDR)); usbinfo("DADDR: %04x\n", getreg16(STM32_USB_DADDR));
llerr("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE)); usbinfo("BTABLE: %04x\n", getreg16(STM32_USB_BTABLE));
/* Endpoint register */ /* Endpoint register */
addr = STM32_USB_EPR(epno); addr = STM32_USB_EPR(epno);
llerr("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr)); usbinfo("EPR%d: [%08x] %04x\n", epno, addr, getreg16(addr));
/* Endpoint descriptor */ /* Endpoint descriptor */
addr = STM32_USB_BTABLE_ADDR(epno, 0); addr = STM32_USB_BTABLE_ADDR(epno, 0);
llerr("DESC: %08x\n", addr); usbinfo("DESC: %08x\n", addr);
/* Endpoint buffer descriptor */ /* Endpoint buffer descriptor */
addr = STM32_USB_ADDR_TX(epno); addr = STM32_USB_ADDR_TX(epno);
llerr(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr)); usbinfo(" TX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_TX(epno); addr = STM32_USB_COUNT_TX(epno);
llerr(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); usbinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_ADDR_RX(epno); addr = STM32_USB_ADDR_RX(epno);
llerr(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr)); usbinfo(" RX ADDR: [%08x] %04x\n", addr, getreg16(addr));
addr = STM32_USB_COUNT_RX(epno); addr = STM32_USB_COUNT_RX(epno);
llerr(" COUNT: [%08x] %04x\n", addr, getreg16(addr)); usbinfo(" COUNT: [%08x] %04x\n", addr, getreg16(addr));
} }
#endif #endif
@@ -770,19 +771,19 @@ static void stm32_dumpep(int epno)
* Name: stm32_checksetup * Name: stm32_checksetup
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_USBDEV_REGDEBUG
static void stm32_checksetup(void) static void stm32_checksetup(void)
{ {
uint32_t cfgr = getreg32(STM32_RCC_CFGR); uint32_t cfgr = getreg32(STM32_RCC_CFGR);
uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR); uint32_t apb1rstr = getreg32(STM32_RCC_APB1RSTR);
uint32_t apb1enr = getreg32(STM32_RCC_APB1ENR); uint32_t apb1enr = getreg32(STM32_RCC_APB1ENR);
llerr("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr); usbinfo("CFGR: %08x APB1RSTR: %08x APB1ENR: %08x\n", cfgr, apb1rstr, apb1enr);
if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 || if ((apb1rstr & RCC_APB1RSTR_USBRST) != 0 ||
(apb1enr & RCC_APB1ENR_USBEN) == 0) (apb1enr & RCC_APB1ENR_USBEN) == 0)
{ {
llerr("ERROR: USB is NOT setup correctly\n"); usbinfo("ERROR: USB is NOT setup correctly\n");
} }
} }
#endif #endif
@@ -2844,7 +2845,7 @@ static int stm32_epconfigure(struct usbdev_ep_s *ep,
if (!ep || !desc) if (!ep || !desc)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
ullerr("ERROR: ep=%p desc=%p\n"); uusbinfo("ERROR: ep=%p desc=%p\n");
return -EINVAL; return -EINVAL;
} }
#endif #endif
@@ -2940,7 +2941,7 @@ static int stm32_epdisable(struct usbdev_ep_s *ep)
if (!ep) if (!ep)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
ullerr("ERROR: ep=%p\n", ep); uusbinfo("ERROR: ep=%p\n", ep);
return -EINVAL; return -EINVAL;
} }
#endif #endif
@@ -3028,7 +3029,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (!req || !req->callback || !req->buf || !ep) if (!req || !req->callback || !req->buf || !ep)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
ullerr("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep); uusbinfo("ERROR: req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
return -EINVAL; return -EINVAL;
} }
#endif #endif
@@ -3040,7 +3041,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (!priv->driver) if (!priv->driver)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
ullerr("ERROR: driver=%p\n", priv->driver); uusbinfo("ERROR: driver=%p\n", priv->driver);
return -ESHUTDOWN; return -ESHUTDOWN;
} }
#endif #endif
@@ -3057,7 +3058,7 @@ static int stm32_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
if (privep->stalled) if (privep->stalled)
{ {
stm32_abortrequest(privep, privreq, -EBUSY); stm32_abortrequest(privep, privreq, -EBUSY);
ullerr("ERROR: stalled\n"); uusbinfo("ERROR: stalled\n");
ret = -EBUSY; ret = -EBUSY;
} }
@@ -3136,7 +3137,7 @@ static int stm32_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req)
struct stm32_ep_s *privep = (struct stm32_ep_s *)ep; struct stm32_ep_s *privep = (struct stm32_ep_s *)ep;
irqstate_t flags; irqstate_t flags;
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!ep || !req) if (!ep || !req)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3163,7 +3164,7 @@ static int stm32_epstall(struct usbdev_ep_s *ep, bool resume)
uint16_t status; uint16_t status;
irqstate_t flags; irqstate_t flags;
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!ep) if (!ep)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3305,7 +3306,7 @@ static struct usbdev_ep_s *stm32_allocep(struct usbdev_s *dev, uint8_t epno,
int bufno; int bufno;
usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno); usbtrace(TRACE_DEVALLOCEP, (uint16_t)epno);
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!dev) if (!dev)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3379,7 +3380,7 @@ static void stm32_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
struct stm32_usbdev_s *priv; struct stm32_usbdev_s *priv;
struct stm32_ep_s *privep; struct stm32_ep_s *privep;
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!dev || !ep) if (!dev || !ep)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3410,7 +3411,7 @@ static int stm32_getframe(struct usbdev_s *dev)
{ {
uint16_t fnr; uint16_t fnr;
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!dev) if (!dev)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3435,7 +3436,7 @@ static int stm32_wakeup(struct usbdev_s *dev)
irqstate_t flags; irqstate_t flags;
usbtrace(TRACE_DEVWAKEUP, 0); usbtrace(TRACE_DEVWAKEUP, 0);
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!dev) if (!dev)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3473,7 +3474,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!dev) if (!dev)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -3834,7 +3835,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVREGISTER, 0); usbtrace(TRACE_DEVREGISTER, 0);
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (!driver || !driver->ops->bind || !driver->ops->unbind || if (!driver || !driver->ops->bind || !driver->ops->unbind ||
!driver->ops->disconnect || !driver->ops->setup) !driver->ops->disconnect || !driver->ops->setup)
{ {
@@ -3912,7 +3913,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
usbtrace(TRACE_DEVUNREGISTER, 0); usbtrace(TRACE_DEVUNREGISTER, 0);
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_USB
if (driver != priv->driver) if (driver != priv->driver)
{ {
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
arch/arm/src/stm32/stm32_wwdg.c
+12 -8
View File
@@ -81,6 +81,10 @@
# define CONFIG_STM32_WWDG_DEFTIMOUT WWDG_MAXTIMEOUT # define CONFIG_STM32_WWDG_DEFTIMOUT WWDG_MAXTIMEOUT
#endif #endif
#ifndef CONFIG_DEBUG_WATCHDOG_INFO
# undef CONFIG_STM32_WWDG_REGDEBUG
#endif
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@@ -105,7 +109,7 @@ struct stm32_lowerhalf_s
****************************************************************************/ ****************************************************************************/
/* Register operations ******************************************************/ /* Register operations ******************************************************/
#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_WWDG_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr); static uint16_t stm32_getreg(uint32_t addr);
static void stm32_putreg(uint16_t val, uint32_t addr); static void stm32_putreg(uint16_t val, uint32_t addr);
#else #else
@@ -165,7 +169,7 @@ static struct stm32_lowerhalf_s g_wdgdev;
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_WWDG_REGDEBUG
static uint16_t stm32_getreg(uint32_t addr) static uint16_t stm32_getreg(uint32_t addr)
{ {
static uint32_t prevaddr = 0; static uint32_t prevaddr = 0;
@@ -186,7 +190,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
if (count == 4) if (count == 4)
{ {
llerr("...\n"); wdinfo("...\n");
} }
return val; return val;
@@ -203,7 +207,7 @@ static uint16_t stm32_getreg(uint32_t addr)
{ {
/* Yes.. then show how many times the value repeated */ /* Yes.. then show how many times the value repeated */
llerr("[repeats %d more times]\n", count-3); wdinfo("[repeats %d more times]\n", count-3);
} }
/* Save the new address, value, and count */ /* Save the new address, value, and count */
@@ -215,7 +219,7 @@ static uint16_t stm32_getreg(uint32_t addr)
/* Show the register value read */ /* Show the register value read */
llerr("%08x->%04x\n", addr, val); wdinfo("%08x->%04x\n", addr, val);
return val; return val;
} }
#endif #endif
@@ -228,12 +232,12 @@ static uint16_t stm32_getreg(uint32_t addr)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES) #ifdef CONFIG_STM32_WWDG_REGDEBUG
static void stm32_putreg(uint16_t val, uint32_t addr) static void stm32_putreg(uint16_t val, uint32_t addr)
{ {
/* Show the register value being written */ /* Show the register value being written */
llerr("%08x<-%04x\n", addr, val); wdinfo("%08x<-%04x\n", addr, val);
/* Write the value */ /* Write the value */
@@ -499,7 +503,7 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
if (timeout < 1 || timeout > WWDG_MAXTIMEOUT) if (timeout < 1 || timeout > WWDG_MAXTIMEOUT)
{ {
wderr("Cannot represent timeout=%d > %d\n", wderr("ERROR: Cannot represent timeout=%d > %d\n",
timeout, WWDG_MAXTIMEOUT); timeout, WWDG_MAXTIMEOUT);
return -ERANGE; return -ERANGE;
} }
arch/arm/src/stm32/stm32f20xxx_dma.c
+2 -2
View File
@@ -606,8 +606,8 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
uint32_t regoffset; uint32_t regoffset;
uint32_t regval; uint32_t regval;
dmaerr("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n", dmainfo("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
paddr, maddr, ntransfers, scr); paddr, maddr, ntransfers, scr);
/* "If the stream is enabled, disable it by resetting the EN bit in the /* "If the stream is enabled, disable it by resetting the EN bit in the
* DMA_SxCR register, then read this bit in order to confirm that there is no * DMA_SxCR register, then read this bit in order to confirm that there is no
arch/arm/src/stm32/stm32f30xxx_i2c.c
+3 -3
View File
@@ -966,7 +966,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -1007,7 +1007,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
if (priv->tndx >= (CONFIG_I2C_NTRACE-1)) if (priv->tndx >= (CONFIG_I2C_NTRACE-1))
{ {
i2cerr("Trace table overflow\n"); i2cerr("ERROR: Trace table overflow\n");
return; return;
} }
@@ -1700,7 +1700,7 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s
status = stm32_i2c_getstatus(priv); status = stm32_i2c_getstatus(priv);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
i2cerr("Timed out: CR1: %04x status: %08x\n", i2cerr("ERROR: Timed out: CR1: %04x status: %08x\n",
stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status); stm32_i2c_getreg(priv, STM32_I2C_CR1_OFFSET), status);
/* "Note: When the STOP, START or PEC bit is set, the software must /* "Note: When the STOP, START or PEC bit is set, the software must
arch/arm/src/stm32/stm32f40xxx_dma.c
+2 -2
View File
@@ -605,8 +605,8 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
uint32_t regoffset; uint32_t regoffset;
uint32_t regval; uint32_t regval;
dmaerr("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n", dmainfo("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
paddr, maddr, ntransfers, scr); paddr, maddr, ntransfers, scr);
#ifdef CONFIG_STM32_DMACAPABLE #ifdef CONFIG_STM32_DMACAPABLE
DEBUGASSERT(stm32_dmacapable(maddr, ntransfers, scr)); DEBUGASSERT(stm32_dmacapable(maddr, ntransfers, scr));
arch/arm/src/stm32/stm32f40xxx_rtcc.c
+5 -5
View File
@@ -971,13 +971,13 @@ int up_rtc_initialize(void)
{ {
case OK: case OK:
{ {
rtcllerr("rtc_syncwait() okay\n"); rtcllinfo("rtc_syncwait() okay\n");
break; break;
} }
default: default:
{ {
rtcllerr("rtc_syncwait() failed (%d)\n", ret); rtcllerr("ERROR: rtc_syncwait() failed (%d)\n", ret);
break; break;
} }
} }
@@ -991,7 +991,7 @@ int up_rtc_initialize(void)
if (regval != RTC_MAGIC) if (regval != RTC_MAGIC)
{ {
rtcllerr("Do setup\n"); rtcllinfo("Do setup\n");
/* Perform the one-time setup of the LSE clocking to the RTC */ /* Perform the one-time setup of the LSE clocking to the RTC */
@@ -1009,7 +1009,7 @@ int up_rtc_initialize(void)
} }
else else
{ {
rtcllerr("Do resume\n"); rtcllinfo("Do resume\n");
/* RTC already set-up, just resume normal operation */ /* RTC already set-up, just resume normal operation */
@@ -1025,7 +1025,7 @@ int up_rtc_initialize(void)
if (ret != OK && nretry > 0) if (ret != OK && nretry > 0)
{ {
rtcllerr("setup/resume ran %d times and failed with %d\n", rtcllinfo("setup/resume ran %d times and failed with %d\n",
nretry, ret); nretry, ret);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
arch/arm/src/stm32f7/stm32_gpio.h
+1 -1
View File
@@ -345,7 +345,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
* *
************************************************************************************/ ************************************************************************************/
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_GPIO_INFO
int stm32_dumpgpio(uint32_t pinset, const char *msg); int stm32_dumpgpio(uint32_t pinset, const char *msg);
#else #else
# define stm32_dumpgpio(p,m) # define stm32_dumpgpio(p,m)