Replace all occurrences of vdbg with vinfo

This commit is contained in:
Gregory Nutt
2016-06-11 11:59:51 -06:00
parent 3a74a438d9
commit fc3540cffe
845 changed files with 5817 additions and 5817 deletions
+11 -11
View File
@@ -371,10 +371,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/****************************************************************************
@@ -791,11 +791,11 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
/* Reset the lcd display to the default state */
lcdvdbg("ili9341 LCD driver: Software Reset\n");
lcdinfo("ili9341 LCD driver: Software Reset\n");
lcd->sendcmd(lcd, ILI9341_SOFTWARE_RESET);
up_mdelay(5);
lcdvdbg("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient);
lcdinfo("ili9341 LCD driver: set Memory Access Control: %04x\n", dev->orient);
lcd->sendcmd(lcd, ILI9341_MEMORY_ACCESS_CONTROL);
lcd->sendparam(lcd, dev->orient);
@@ -809,13 +809,13 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
/* 16 bit RGB565 */
lcdvdbg("ili9341 LCD driver: Set Pixel Format: %04x\n",
lcdinfo("ili9341 LCD driver: Set Pixel Format: %04x\n",
ILI9341_PIXSET_16BITMCU_PARAM1);
lcd->sendparam(lcd, ILI9341_PIXSET_16BITMCU_PARAM1);
/* 18 bit RGB666, add settings here */
lcdvdbg("ili9341 LCD driver: Set Interface control\n");
lcdinfo("ili9341 LCD driver: Set Interface control\n");
lcd->sendcmd(lcd, ILI9341_INTERFACE_CONTROL);
lcd->sendparam(lcd, ILI9341_IFCTL_PARAM1);
lcd->sendparam(lcd, ILI9341_IFCTL_PARAM2);
@@ -823,7 +823,7 @@ static int ili9341_hwinitialize(FAR struct ili9341_dev_s *dev)
/* Sleep out */
lcdvdbg("ili9341 LCD driver: Sleep Out\n");
lcdinfo("ili9341 LCD driver: Sleep Out\n");
lcd->sendcmd(lcd, ILI9341_SLEEP_OUT);
up_mdelay(120);
@@ -948,7 +948,7 @@ static int ili9341_getvideoinfo(FAR struct lcd_dev_s *dev,
vinfo->yres = ili9341_getyres(priv);
vinfo->nplanes = 1;
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes);
return OK;
@@ -989,7 +989,7 @@ static int ili9341_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
pinfo->bpp = priv->bpp;
pinfo->buffer = (FAR uint8_t *)priv->runbuffer; /* Run scratch buffer */
lcdvdbg("planeno: %d bpp: %d\n", planeno, pinfo->bpp);
lcdinfo("planeno: %d bpp: %d\n", planeno, pinfo->bpp);
return OK;
}
@@ -1103,7 +1103,7 @@ static int ili9341_setpower(FAR struct lcd_dev_s *dev, int power)
static int ili9341_getcontrast(struct lcd_dev_s *dev)
{
lcdvdbg("Not implemented\n");
lcdinfo("Not implemented\n");
return -ENOSYS;
}
@@ -1125,7 +1125,7 @@ static int ili9341_getcontrast(struct lcd_dev_s *dev)
static int ili9341_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
return -ENOSYS;
}
+6 -6
View File
@@ -113,10 +113,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/****************************************************************************
@@ -408,7 +408,7 @@ static int memlcd_putrun(fb_coord_t row, fb_coord_t col,
int i;
DEBUGASSERT(buffer);
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
#ifdef CONFIG_NX_PACKEDMSFIRST
usrmask = MS_BIT;
@@ -499,7 +499,7 @@ static int memlcd_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer,
int i;
DEBUGASSERT(buffer);
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
#ifdef CONFIG_NX_PACKEDMSFIRST
usrmask = MS_BIT;
@@ -557,7 +557,7 @@ static int memlcd_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres,
g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -576,7 +576,7 @@ static int memlcd_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
+11 -11
View File
@@ -241,10 +241,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -534,7 +534,7 @@ static int mio283qt2_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *b
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Select the LCD */
@@ -584,7 +584,7 @@ static int mio283qt2_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Select the LCD */
@@ -632,7 +632,7 @@ static int mio283qt2_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
MIO283QT2_COLORFMT, MIO283QT2_XRES, MIO283QT2_XRES);
vinfo->fmt = MIO283QT2_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -656,7 +656,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen
FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev;
DEBUGASSERT(dev && pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP);
lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT2_BPP);
pinfo->putrun = mio283qt2_putrun; /* Put a run into LCD memory */
pinfo->getrun = mio283qt2_getrun; /* Get a run from LCD memory */
@@ -676,7 +676,7 @@ static int mio283qt2_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planen
static int mio283qt2_getpower(FAR struct lcd_dev_s *dev)
{
lcdvdbg("power: %d\n", 0);
lcdinfo("power: %d\n", 0);
return g_lcddev.power;
}
@@ -727,7 +727,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power)
FAR struct mio283qt2_dev_s *priv = (FAR struct mio283qt2_dev_s *)dev;
FAR struct mio283qt2_lcd_s *lcd = priv->lcd;
lcdvdbg("power: %d\n", power);
lcdinfo("power: %d\n", power);
DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
/* Set new power level */
@@ -778,7 +778,7 @@ static int mio283qt2_setpower(FAR struct lcd_dev_s *dev, int power)
static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev)
{
lcdvdbg("Not implemented\n");
lcdinfo("Not implemented\n");
return -ENOSYS;
}
@@ -792,7 +792,7 @@ static int mio283qt2_getcontrast(FAR struct lcd_dev_s *dev)
static int mio283qt2_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
{
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
return -ENOSYS;
}
@@ -955,7 +955,7 @@ FAR struct lcd_dev_s *mio283qt2_lcdinitialize(FAR struct mio283qt2_lcd_s *lcd)
{
int ret;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
/* If we ccould support multiple MIO283QT2 devices, this is where we would allocate
* a new driver data structure... but we can't. Why not? Because of a bad should
+20 -20
View File
@@ -140,10 +140,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -498,7 +498,7 @@ static int mio283qt9a_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("mio283qt9a_getrun row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Read the run from GRAM. */
@@ -543,7 +543,7 @@ static int mio283qt9a_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
MIO283QT9A_COLORFMT, MIO283QT9A_XRES, MIO283QT9A_YRES);
vinfo->fmt = MIO283QT9A_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -567,7 +567,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane
FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev;
DEBUGASSERT(dev && pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP);
lcdinfo("planeno: %d bpp: %d\n", planeno, MIO283QT9A_BPP);
pinfo->putrun = mio283qt9a_putrun; /* Put a run into LCD memory */
pinfo->getrun = mio283qt9a_getrun; /* Get a run from LCD memory */
@@ -588,7 +588,7 @@ static int mio283qt9a_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int plane
static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev)
{
lcdvdbg("getpower: %d\n", 0);
lcdinfo("getpower: %d\n", 0);
return g_lcddev.power;
}
@@ -604,7 +604,7 @@ static int mio283qt9a_getpower(FAR struct lcd_dev_s *dev)
static int mio283qt9a_poweroff(FAR struct mio283qt9a_lcd_s *lcd)
{
/* Select the LCD */
lcdvdbg("mio283qt9a_poweroff\n");
lcdinfo("mio283qt9a_poweroff\n");
lcd->select(lcd);
@@ -640,7 +640,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power)
FAR struct mio283qt9a_dev_s *priv = (FAR struct mio283qt9a_dev_s *)dev;
FAR struct mio283qt9a_lcd_s *lcd = priv->lcd;
lcdvdbg("setpower: %d\n", power);
lcdinfo("setpower: %d\n", power);
DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
/* Set new power level */
@@ -687,7 +687,7 @@ static int mio283qt9a_setpower(FAR struct lcd_dev_s *dev, int power)
static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev)
{
lcdvdbg("Not implemented\n");
lcdinfo("Not implemented\n");
return -ENOSYS;
}
@@ -701,7 +701,7 @@ static int mio283qt9a_getcontrast(FAR struct lcd_dev_s *dev)
static int mio283qt9a_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
{
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
return -ENOSYS;
}
@@ -739,7 +739,7 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
id_c = lcd->read(lcd);
id_d = lcd->read(lcd);
lcdvdbg("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d);
lcdinfo("LCD ID: %04x %04x %04x %04x\n", id_a, id_b, id_c, id_d);
UNUSED(id_a);
UNUSED(id_b);
@@ -781,38 +781,38 @@ static inline int mio283qt9a_hwinitialize(FAR struct mio283qt9a_dev_s *priv)
id_b = lcd->read(lcd);
id_c = lcd->read(lcd);
id_d = lcd->read(lcd);
lcdvdbg("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d);
lcdinfo("LCD man ID: %02x, version: %02x, driver ID: %02x\n", id_b, id_c, id_d);
id_a = mio283qt9a_readreg(lcd, 0x09); /* Read display status */
id_b = lcd->read(lcd);
id_c = lcd->read(lcd);
id_d = lcd->read(lcd);
id_e = lcd->read(lcd);
lcdvdbg("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e);
lcdinfo("Display status %02x, %02x, %02x, %02x, %02x\n", id_a, id_b, id_c, id_d, id_e);
id_a = mio283qt9a_readreg(lcd, 0x0a); /* Read power status */
id_b = lcd->read(lcd);
lcdvdbg("Power status %02x, %02x\n", id_a, id_b);
lcdinfo("Power status %02x, %02x\n", id_a, id_b);
id_a = mio283qt9a_readreg(lcd, 0x0b); /* Read MADCTL */
id_b = lcd->read(lcd);
lcdvdbg("MADCTL %02x, %02x\n", id_a, id_b);
lcdinfo("MADCTL %02x, %02x\n", id_a, id_b);
id_a = mio283qt9a_readreg(lcd, 0x0c); /* Read pixel format */
id_b = lcd->read(lcd);
lcdvdbg("Pixel format %02x, %02x\n", id_a, id_b);
lcdinfo("Pixel format %02x, %02x\n", id_a, id_b);
id_a = mio283qt9a_readreg(lcd, 0x0d); /* Read image format */
id_b = lcd->read(lcd);
lcdvdbg("Image format %02x, %02x\n", id_a, id_b);
lcdinfo("Image format %02x, %02x\n", id_a, id_b);
id_a = mio283qt9a_readreg(lcd, 0x0e); /* read signal mode */
id_b = lcd->read(lcd);
lcdvdbg("Signal mode %02x, %02x\n", id_a, id_b);
lcdinfo("Signal mode %02x, %02x\n", id_a, id_b);
id_a = mio283qt9a_readreg(lcd, 0x0f); /* read self diag */
id_b = lcd->read(lcd);
lcdvdbg("Self diag %02x, %02x\n", id_a, id_b);
lcdinfo("Self diag %02x, %02x\n", id_a, id_b);
#endif
ret = OK;
}
@@ -849,7 +849,7 @@ FAR struct lcd_dev_s *mio283qt9a_lcdinitialize(FAR struct mio283qt9a_lcd_s *lcd)
FAR struct mio283qt9a_dev_s *priv;
int ret;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
/* If we could support multiple MIO283QT9A devices, this is where we would allocate
* a new driver data structure... but we can't. Why not? Because of a bad should
+10 -10
View File
@@ -308,7 +308,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_REGDEBUG
# define lcddbg(format, ...) llvdbg(format, ##__VA_ARGS__)
# define lcddbg(format, ...) llinfo(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif
@@ -866,7 +866,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
FAR struct spi_dev_s *spi = priv->spi;
uint16_t cmd[3];
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
#if NOKIA_XBIAS > 0
col += NOKIA_XBIAS;
@@ -917,7 +917,7 @@ static int nokia_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
static int nokia_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
size_t npixels)
{
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* At present, this is a write-only LCD driver */
@@ -938,7 +938,7 @@ static int nokia_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -956,7 +956,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -973,7 +973,7 @@ static int nokia_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int nokia_getpower(struct lcd_dev_s *dev)
{
struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
gvdbg("power: %d\n", priv->power);
ginfo("power: %d\n", priv->power);
return priv->power;
}
@@ -991,7 +991,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power)
struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
int ret;
gvdbg("power: %d\n", power);
ginfo("power: %d\n", power);
DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
/* Set new power level. The backlight power is controlled outside of the LCD
@@ -1017,7 +1017,7 @@ static int nokia_setpower(struct lcd_dev_s *dev, int power)
static int nokia_getcontrast(struct lcd_dev_s *dev)
{
struct nokia_dev_s *priv = (struct nokia_dev_s *)dev;
gvdbg("contrast: %d\n", priv->contrast);
ginfo("contrast: %d\n", priv->contrast);
return priv->contrast;
}
@@ -1056,7 +1056,7 @@ static int nokia_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
#endif
}
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
return -ENOSYS;
}
@@ -1169,7 +1169,7 @@ FAR struct lcd_dev_s *nokia_lcdinitialize(FAR struct spi_dev_s *spi, unsigned in
{
struct nokia_dev_s *priv = &g_lcddev;
gvdbg("Initializing\n");
ginfo("Initializing\n");
DEBUGASSERT(devno == 0);
/* Initialize the driver data structure */
+8 -8
View File
@@ -180,7 +180,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_RITDEBUG
# define ritdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define ritdbg(format, ...) info(format, ##__VA_ARGS__)
#else
# define ritdbg(x...)
#endif
@@ -990,7 +990,7 @@ static int rit_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -1008,7 +1008,7 @@ static int rit_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -1027,7 +1027,7 @@ static int rit_getpower(FAR struct lcd_dev_s *dev)
FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)dev;
DEBUGASSERT(priv);
gvdbg("power: %s\n", priv->on ? "ON" : "OFF");
ginfo("power: %s\n", priv->on ? "ON" : "OFF");
return priv->on ? CONFIG_LCD_MAXPOWER : 0;
}
@@ -1045,7 +1045,7 @@ static int rit_setpower(struct lcd_dev_s *dev, int power)
struct rit_dev_s *priv = (struct rit_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi);
gvdbg("power: %d\n", power);
ginfo("power: %d\n", power);
/* Select the SD1329 controller */
@@ -1090,7 +1090,7 @@ static int rit_getcontrast(struct lcd_dev_s *dev)
{
struct rit_dev_s *priv = (struct rit_dev_s *)dev;
gvdbg("contrast: %d\n", priv->contrast);
ginfo("contrast: %d\n", priv->contrast);
return priv->contrast;
}
@@ -1107,7 +1107,7 @@ static int rit_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
struct rit_dev_s *priv = (struct rit_dev_s *)dev;
uint8_t cmd[3];
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
DEBUGASSERT(contrast <= CONFIG_LCD_MAXCONTRAST);
/* Select the SD1329 controller */
@@ -1156,7 +1156,7 @@ FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, unsigned int dev
FAR struct rit_dev_s *priv = (FAR struct rit_dev_s *)&g_oleddev;
DEBUGASSERT(devno == 0 && spi);
gvdbg("Initializing devno: %d\n", devno);
ginfo("Initializing devno: %d\n", devno);
/* Driver state data */
+11 -11
View File
@@ -80,10 +80,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
#define MAX_OPENCNT (255) /* Limit of uint8_t */
@@ -185,7 +185,7 @@ static void pca8574_write(FAR struct pcf8574_lcd_dev_s *priv, uint8_t data)
ret = i2c_write(priv->i2c, &config, &data, 1);
if (ret < 0)
{
lcdvdbg("pca8574_write() failed: %d\n", ret);
lcdinfo("pca8574_write() failed: %d\n", ret);
return;
}
@@ -222,7 +222,7 @@ static int pca8574_read(FAR struct pcf8574_lcd_dev_s *priv, uint8_t* data)
ret = i2c_read(priv->i2c, &config, data, 1);
if (ret < 0)
{
lcdvdbg("pca8574_read() failed: %d\n", ret);
lcdinfo("pca8574_read() failed: %d\n", ret);
}
return ret;
@@ -704,7 +704,7 @@ static void lcd_scroll_up(FAR struct pcf8574_lcd_dev_s *priv)
data = (uint8_t *)malloc(priv->cfg.cols);
if (NULL == data)
{
lcdvdbg("Failed to allocate buffer in lcd_scroll_up()\n");
lcdinfo("Failed to allocate buffer in lcd_scroll_up()\n");
return;
}
@@ -1428,7 +1428,7 @@ static int pcf8574_lcd_ioctl(FAR struct file *filep, int cmd,
FAR struct pcf8574_lcd_dev_s *priv = (FAR struct pcf8574_lcd_dev_s *)inode->i_private;
FAR struct slcd_attributes_s *attr = (FAR struct slcd_attributes_s *)((uintptr_t)arg);
lcdvdbg("SLCDIOC_GETATTRIBUTES:\n");
lcdinfo("SLCDIOC_GETATTRIBUTES:\n");
if (!attr)
{
@@ -1578,13 +1578,13 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
if (cfg->rows < 1 || cfg->rows > 4)
{
lcdvdbg("Display rows must be 1-4\n");
lcdinfo("Display rows must be 1-4\n");
return -EINVAL;
}
if ((cfg->cols < 1 || cfg->cols > 64) || (cfg->rows == 4 && cfg->cols > 32))
{
lcdvdbg("Display cols must be 1-64, and may not be part of a 4x40 configuration\n");
lcdinfo("Display cols must be 1-64, and may not be part of a 4x40 configuration\n");
return -EINVAL;
}
@@ -1593,7 +1593,7 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
priv = (FAR struct pcf8574_lcd_dev_s *)kmm_malloc(sizeof(struct pcf8574_lcd_dev_s));
if (!priv)
{
lcdvdbg("Failed to allocate instance\n");
lcdinfo("Failed to allocate instance\n");
return -ENOMEM;
}
@@ -1613,10 +1613,10 @@ int pcf8574_lcd_backpack_register(FAR const char *devpath,
ret = register_driver(devpath, &g_pcf8574_lcd_fops, 0666, priv);
if (ret < 0)
{
lcdvdbg("Failed to register driver: %d\n", ret);
lcdinfo("Failed to register driver: %d\n", ret);
kmm_free(priv);
}
lcdvdbg("pcf8574_lcd_backpack driver loaded successfully!\n");
lcdinfo("pcf8574_lcd_backpack driver loaded successfully!\n");
return ret;
}
+17 -17
View File
@@ -176,10 +176,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -334,7 +334,7 @@ static void ra8875_putreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr,
{
/* Set the index register to the register address and write the register contents */
lcdvdbg("putreg 0x%02x = 0x%02x\n", regaddr, regval);
lcdinfo("putreg 0x%02x = 0x%02x\n", regaddr, regval);
lcd->write_reg(lcd, regaddr, regval);
}
@@ -352,7 +352,7 @@ static void ra8875_putreg16(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr,
{
/* Set the index register to the register address and write the register contents */
lcdvdbg("putreg 0x%02x = 0x%04x\n", regaddr, regval);
lcdinfo("putreg 0x%02x = 0x%04x\n", regaddr, regval);
lcd->write_reg16(lcd, regaddr, regval);
}
@@ -373,7 +373,7 @@ static uint8_t ra8875_readreg(FAR struct ra8875_lcd_s *lcd, uint8_t regaddr)
regval = lcd->read_reg(lcd, regaddr);
lcdvdbg("readreg 0x%02x = 0x%02x\n", regaddr, regval);
lcdinfo("readreg 0x%02x = 0x%02x\n", regaddr, regval);
return regval;
}
#endif
@@ -533,13 +533,13 @@ static inline void ra8875_setforeground(FAR struct ra8875_lcd_s *lcd, uint16_t c
static void ra8875_clearmem(FAR struct ra8875_lcd_s *lcd)
{
lcdvdbg("clearmem start\n");
lcdinfo("clearmem start\n");
ra8875_putreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR | RA8875_MCLR_FULL);
/* Wait for operation to finish */
ra8875_waitreg(lcd, RA8875_MCLR, RA8875_MCLR_CLEAR);
lcdvdbg("clearmem done\n");
lcdinfo("clearmem done\n");
}
/**************************************************************************************
@@ -829,7 +829,7 @@ static int ra8875_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
RA8875_COLORFMT, RA8875_XRES, RA8875_YRES);
vinfo->fmt = RA8875_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -853,7 +853,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev;
DEBUGASSERT(dev && pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, RA8875_BPP);
lcdinfo("planeno: %d bpp: %d\n", planeno, RA8875_BPP);
pinfo->putrun = ra8875_putrun; /* Put a run into LCD memory */
pinfo->getrun = ra8875_getrun; /* Get a run from LCD memory */
@@ -873,7 +873,7 @@ static int ra8875_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int ra8875_getpower(FAR struct lcd_dev_s *dev)
{
lcdvdbg("power: %d\n", 0);
lcdinfo("power: %d\n", 0);
return g_lcddev.power;
}
@@ -917,7 +917,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power)
FAR struct ra8875_dev_s *priv = (FAR struct ra8875_dev_s *)dev;
FAR struct ra8875_lcd_s *lcd = priv->lcd;
lcdvdbg("power: %d\n", power);
lcdinfo("power: %d\n", power);
DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
/* Set new power level */
@@ -960,7 +960,7 @@ static int ra8875_setpower(FAR struct lcd_dev_s *dev, int power)
static int ra8875_getcontrast(FAR struct lcd_dev_s *dev)
{
lcdvdbg("Not implemented\n");
lcdinfo("Not implemented\n");
return -ENOSYS;
}
@@ -974,7 +974,7 @@ static int ra8875_getcontrast(FAR struct lcd_dev_s *dev)
static int ra8875_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
{
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
return -ENOSYS;
}
@@ -993,7 +993,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv)
/* REVISIT: Maybe some of these values needs to be configurable?? */
lcdvdbg("hwinitialize\n");
lcdinfo("hwinitialize\n");
/* Reset */
@@ -1076,7 +1076,7 @@ static inline int ra8875_hwinitialize(FAR struct ra8875_dev_s *priv)
priv->shadow_w_curh = 0;
priv->shadow_w_curv = 0;
lcdvdbg("hwinitialize done\n");
lcdinfo("hwinitialize done\n");
return OK;
}
@@ -1098,7 +1098,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd)
{
int ret;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
/* If we could support multiple RA8875 devices, this is where we would allocate
* a new driver data structure... but we can't. Why not? Because of a bad should
@@ -1130,7 +1130,7 @@ FAR struct lcd_dev_s *ra8875_lcdinitialize(FAR struct ra8875_lcd_s *lcd)
ra8875_poweroff(lcd);
lcdvdbg("Initialized\n");
lcdinfo("Initialized\n");
return &g_lcddev.dev;
}
+10 -10
View File
@@ -90,7 +90,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_SKELDEBUG
# define skeldbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define skeldbg(format, ...) info(format, ##__VA_ARGS__)
#else
# define skeldbg(x...)
#endif
@@ -230,7 +230,7 @@ static int skel_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer
{
/* Buffer must be provided and aligned to a 16-bit address boundary */
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Set up to write the run. */
@@ -259,7 +259,7 @@ static int skel_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
{
/* Buffer must be provided and aligned to a 16-bit address boundary */
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
#warning "Missing logic"
@@ -278,7 +278,7 @@ static int skel_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -296,7 +296,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -313,7 +313,7 @@ static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int skel_getpower(struct lcd_dev_s *dev)
{
struct skel_dev_s *priv = (struct skel_dev_s *)dev;
gvdbg("power: %d\n", 0);
ginfo("power: %d\n", 0);
#warning "Missing logic"
return 0;
}
@@ -331,7 +331,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power)
{
struct skel_dev_s *priv = (struct skel_dev_s *)dev;
gvdbg("power: %d\n", power);
ginfo("power: %d\n", power);
DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
/* Set new power level */
@@ -350,7 +350,7 @@ static int skel_setpower(struct lcd_dev_s *dev, int power)
static int skel_getcontrast(struct lcd_dev_s *dev)
{
gvdbg("Not implemented\n");
ginfo("Not implemented\n");
#warning "Missing logic"
return -ENOSYS;
}
@@ -365,7 +365,7 @@ static int skel_getcontrast(struct lcd_dev_s *dev)
static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
#warning "Missing logic"
return -ENOSYS;
}
@@ -386,7 +386,7 @@ static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
FAR struct lcd_dev_s *up_oledinitialize(FAR struct spi_dev_s *spi)
{
gvdbg("Initializing\n");
ginfo("Initializing\n");
/* Configure GPIO pins */
#warning "Missing logic"
+9 -9
View File
@@ -230,10 +230,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg dbg
# define lcdvdbg vdbg
# define lcdinfo info
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -846,7 +846,7 @@ static int ssd1289_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: 1\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: 1\n",
SSD1289_COLORFMT, SSD1289_XRES, SSD1289_YRES);
vinfo->fmt = SSD1289_COLORFMT; /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
@@ -870,7 +870,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev;
DEBUGASSERT(dev && pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, SSD1289_BPP);
lcdinfo("planeno: %d bpp: %d\n", planeno, SSD1289_BPP);
pinfo->putrun = ssd1289_putrun; /* Put a run into LCD memory */
pinfo->getrun = ssd1289_getrun; /* Get a run from LCD memory */
@@ -890,7 +890,7 @@ static int ssd1289_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
static int ssd1289_getpower(FAR struct lcd_dev_s *dev)
{
lcdvdbg("power: %d\n", 0);
lcdinfo("power: %d\n", 0);
return g_lcddev.power;
}
@@ -933,7 +933,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power)
FAR struct ssd1289_dev_s *priv = (FAR struct ssd1289_dev_s *)dev;
FAR struct ssd1289_lcd_s *lcd = priv->lcd;
lcdvdbg("power: %d\n", power);
lcdinfo("power: %d\n", power);
DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER);
/* Set new power level */
@@ -974,7 +974,7 @@ static int ssd1289_setpower(FAR struct lcd_dev_s *dev, int power)
static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev)
{
lcdvdbg("Not implemented\n");
lcdinfo("Not implemented\n");
return -ENOSYS;
}
@@ -988,7 +988,7 @@ static int ssd1289_getcontrast(FAR struct lcd_dev_s *dev)
static int ssd1289_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast)
{
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
return -ENOSYS;
}
@@ -1302,7 +1302,7 @@ FAR struct lcd_dev_s *ssd1289_lcdinitialize(FAR struct ssd1289_lcd_s *lcd)
{
int ret;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
/* If we ccould support multiple SSD1289 devices, this is where we would allocate
* a new driver data structure... but we can't. Why not? Because of a bad should
+2 -2
View File
@@ -213,10 +213,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
+9 -9
View File
@@ -272,7 +272,7 @@ static int ssd1306_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buf
int pixlen;
uint8_t i;
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -480,7 +480,7 @@ static int ssd1306_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
int pixlen;
uint8_t i;
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -625,7 +625,7 @@ static int ssd1306_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -643,7 +643,7 @@ static int ssd1306_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -662,7 +662,7 @@ static int ssd1306_getpower(FAR struct lcd_dev_s *dev)
FAR struct ssd1306_dev_s *priv = (FAR struct ssd1306_dev_s *)dev;
DEBUGASSERT(priv);
lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF");
lcdinfo("power: %s\n", priv->on ? "ON" : "OFF");
return priv->on ? CONFIG_LCD_MAXPOWER : 0;
}
@@ -680,7 +680,7 @@ static int ssd1306_setpower(FAR struct lcd_dev_s *dev, int power)
struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
/* Lock and select device */
@@ -720,7 +720,7 @@ static int ssd1306_getcontrast(struct lcd_dev_s *dev)
struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
DEBUGASSERT(priv);
lcdvdbg("contrast: %d\n", priv->contrast);
lcdinfo("contrast: %d\n", priv->contrast);
return priv->contrast;
}
@@ -737,7 +737,7 @@ static int ssd1306_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
struct ssd1306_dev_s *priv = (struct ssd1306_dev_s *)dev;
unsigned int scaled;
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
DEBUGASSERT(priv);
/* Verify the contrast value */
@@ -812,7 +812,7 @@ FAR struct lcd_dev_s *ssd1306_initialize(FAR struct i2c_master_s *dev, unsigned
{
FAR struct ssd1306_dev_s *priv = &g_oleddev;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
DEBUGASSERT(spi && devno == 0);
#ifdef CONFIG_LCD_SSD1306_SPI
+1 -1
View File
@@ -63,7 +63,7 @@
static inline void ssd1306_configspi(FAR struct spi_dev_s *spi)
{
lcdvdbg("Mode: %d Bits: 8 Frequency: %d\n",
lcdinfo("Mode: %d Bits: 8 Frequency: %d\n",
CONFIG_SSD1306_SPIMODE, CONFIG_SSD1306_FREQUENCY);
/* Configure SPI for the SSD1306 */
+4 -4
View File
@@ -821,7 +821,7 @@ static int ssd1351_getvideoinfo(FAR struct lcd_dev_s *dev,
vinfo->yres = SSD1351_YRES;
vinfo->nplanes = 1;
gvdbg("fmt: %u xres: %u yres: %u nplanes: %u\n",
ginfo("fmt: %u xres: %u yres: %u nplanes: %u\n",
vinfo->fmt, vinfo->xres, vinfo->yres, vinfo->nplanes);
return OK;
}
@@ -847,7 +847,7 @@ static int ssd1351_getplaneinfo(FAR struct lcd_dev_s *dev,
pinfo->buffer = (uint8_t *)priv->runbuffer;
pinfo->bpp = SSD1351_BPP;
gvdbg("planeno: %u bpp: %u\n", planeno, pinfo->bpp);
ginfo("planeno: %u bpp: %u\n", planeno, pinfo->bpp);
return OK;
}
@@ -868,7 +868,7 @@ static int ssd1351_getpower(FAR struct lcd_dev_s *dev)
/* Sanity check */
DEBUGASSERT(priv != NULL);
gvdbg("power: %d\n", priv->power);
ginfo("power: %d\n", priv->power);
return priv->power;
}
@@ -890,7 +890,7 @@ static int ssd1351_setpower(FAR struct lcd_dev_s *dev, int power)
/* Sanity check */
DEBUGASSERT(priv != NULL && (unsigned int)power <= LCD_FULL_ON);
gvdbg("power: %d\n", power);
ginfo("power: %d\n", power);
/* Select and lock the device */
+9 -9
View File
@@ -179,7 +179,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_ST7565DEBUG
# define st7565dbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define st7565dbg(format, ...) info(format, ##__VA_ARGS__)
#else
# define st7565dbg(x...)
#endif
@@ -475,7 +475,7 @@ static int st7565_putrun(fb_coord_t row, fb_coord_t col,
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -627,7 +627,7 @@ static int st7565_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t * buffer,
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -736,7 +736,7 @@ static int st7565_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres,
g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
@@ -755,7 +755,7 @@ static int st7565_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -773,7 +773,7 @@ static int st7565_getpower(struct lcd_dev_s *dev)
{
struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
DEBUGASSERT(priv);
gvdbg("powered: %s\n", priv->power_level);
ginfo("powered: %s\n", priv->power_level);
return priv->power_level;
}
@@ -791,7 +791,7 @@ static int st7565_setpower(struct lcd_dev_s *dev, int power)
struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
gvdbg("power: %s powered: %s\n", power, priv->power_level);
ginfo("power: %s powered: %s\n", power, priv->power_level);
/* Select and lock the device */
@@ -859,7 +859,7 @@ static int st7565_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
struct st7565_dev_s *priv = (struct st7565_dev_s *)dev;
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
DEBUGASSERT(priv);
if (contrast > 255)
@@ -974,7 +974,7 @@ FAR struct lcd_dev_s *st7565_initialize(FAR struct st7565_lcd_s *lcd,
FAR struct st7565_dev_s *priv = &g_st7565dev;
gvdbg("Initializing\n");
ginfo("Initializing\n");
DEBUGASSERT(lcd && devno == 0);
/* Save the reference to the SPI device */
+9 -9
View File
@@ -209,7 +209,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_LCD_ST7567DEBUG
# define st7567dbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define st7567dbg(format, ...) info(format, ##__VA_ARGS__)
#else
# define st7567dbg(x...)
#endif
@@ -439,7 +439,7 @@ static int st7567_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buff
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -587,7 +587,7 @@ static int st7567_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -698,7 +698,7 @@ static int st7567_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -716,7 +716,7 @@ static int st7567_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -734,7 +734,7 @@ static int st7567_getpower(struct lcd_dev_s *dev)
{
struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
DEBUGASSERT(priv);
gvdbg("powered: %s\n", st7567_powerstring(priv->powered));
ginfo("powered: %s\n", st7567_powerstring(priv->powered));
return priv->powered;
}
@@ -752,7 +752,7 @@ static int st7567_setpower(struct lcd_dev_s *dev, int power)
struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
gvdbg("power: %s powered: %s\n",
ginfo("power: %s powered: %s\n",
st7567_powerstring(power), st7567_powerstring(priv->powered));
/* Select and lock the device */
@@ -806,7 +806,7 @@ static int st7567_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
struct st7567_dev_s *priv = (struct st7567_dev_s *)dev;
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
DEBUGASSERT(priv);
if (contrast > 255)
@@ -915,7 +915,7 @@ FAR struct lcd_dev_s *st7567_initialize(FAR struct spi_dev_s *spi, unsigned int
FAR struct st7567_dev_s *priv = &g_st7567dev;
gvdbg("Initializing\n");
ginfo("Initializing\n");
DEBUGASSERT(spi && devno == 0);
/* Save the reference to the SPI device */
+11 -11
View File
@@ -264,10 +264,10 @@
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define lcdvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lcdinfo(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
# define lcdvdbg(x...)
# define lcdinfo(x...)
#endif
/**************************************************************************************
@@ -487,7 +487,7 @@ static int ug2864ambag01_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_
int pixlen;
uint8_t i;
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -697,7 +697,7 @@ static int ug2864ambag01_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buf
int pixlen;
uint8_t i;
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -842,7 +842,7 @@ static int ug2864ambag01_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
lcdvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -860,7 +860,7 @@ static int ug2864ambag01_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int pl
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(pinfo && planeno == 0);
lcdvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -879,7 +879,7 @@ static int ug2864ambag01_getpower(FAR struct lcd_dev_s *dev)
FAR struct ug2864ambag01_dev_s *priv = (FAR struct ug2864ambag01_dev_s *)dev;
DEBUGASSERT(priv);
lcdvdbg("power: %s\n", priv->on ? "ON" : "OFF");
lcdinfo("power: %s\n", priv->on ? "ON" : "OFF");
return priv->on ? CONFIG_LCD_MAXPOWER : 0;
}
@@ -897,7 +897,7 @@ static int ug2864ambag01_setpower(struct lcd_dev_s *dev, int power)
struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER && priv->spi);
lcdvdbg("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
lcdinfo("power: %d [%d]\n", power, priv->on ? CONFIG_LCD_MAXPOWER : 0);
/* Lock and select device */
@@ -939,7 +939,7 @@ static int ug2864ambag01_getcontrast(struct lcd_dev_s *dev)
struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
DEBUGASSERT(priv);
lcdvdbg("contrast: %d\n", priv->contrast);
lcdinfo("contrast: %d\n", priv->contrast);
return priv->contrast;
}
@@ -956,7 +956,7 @@ static int ug2864ambag01_setcontrast(struct lcd_dev_s *dev, unsigned int contras
struct ug2864ambag01_dev_s *priv = (struct ug2864ambag01_dev_s *)dev;
unsigned int scaled;
lcdvdbg("contrast: %d\n", contrast);
lcdinfo("contrast: %d\n", contrast);
DEBUGASSERT(priv);
/* Verify the contrast value */
@@ -1029,7 +1029,7 @@ FAR struct lcd_dev_s *ug2864ambag01_initialize(FAR struct spi_dev_s *spi, unsign
{
FAR struct ug2864ambag01_dev_s *priv = &g_oleddev;
lcdvdbg("Initializing\n");
lcdinfo("Initializing\n");
DEBUGASSERT(spi && devno == 0);
/* Save the reference to the SPI device */
+9 -9
View File
@@ -224,7 +224,7 @@
/* Debug ******************************************************************************/
#ifdef CONFIG_DEBUG_LCD
# define lcddbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define lcddbg(format, ...) info(format, ##__VA_ARGS__)
#else
# define lcddbg(x...)
#endif
@@ -484,7 +484,7 @@ static int ug_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -681,7 +681,7 @@ static int ug_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
uint8_t i;
int pixlen;
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
ginfo("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer);
/* Clip the run to the display */
@@ -824,7 +824,7 @@ static int ug_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n",
g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes);
memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s));
return OK;
@@ -842,7 +842,7 @@ static int ug_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s));
return OK;
}
@@ -860,7 +860,7 @@ static int ug_getpower(struct lcd_dev_s *dev)
{
struct ug_dev_s *priv = (struct ug_dev_s *)dev;
DEBUGASSERT(priv);
gvdbg("powered: %s\n", ug_powerstring(priv->powered));
ginfo("powered: %s\n", ug_powerstring(priv->powered));
return priv->powered;
}
@@ -878,7 +878,7 @@ static int ug_setpower(struct lcd_dev_s *dev, int power)
struct ug_dev_s *priv = (struct ug_dev_s *)dev;
DEBUGASSERT(priv && (unsigned)power <= CONFIG_LCD_MAXPOWER);
gvdbg("power: %s powered: %s\n",
ginfo("power: %s powered: %s\n",
ug_powerstring(power), ug_powerstring(priv->powered));
/* Select and lock the device */
@@ -947,7 +947,7 @@ static int ug_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
struct ug_dev_s *priv = (struct ug_dev_s *)dev;
gvdbg("contrast: %d\n", contrast);
ginfo("contrast: %d\n", contrast);
DEBUGASSERT(priv);
if (contrast > 255)
@@ -1056,7 +1056,7 @@ FAR struct lcd_dev_s *ug_initialize(FAR struct spi_dev_s *spi, unsigned int devn
FAR struct ug_dev_s *priv = &g_ugdev;
gvdbg("Initializing\n");
ginfo("Initializing\n");
DEBUGASSERT(spi && devno == 0);
/* Save the reference to the SPI device */