On Fri, Jun 15, 2018 at 12:37 AM Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
>
> On Thu, Jun 14, 2018 at 09:11:13PM -0700, Andrey Smirnov wrote:
> > PBL, CONSOLE_FULL and CONSOLE_SIMPLE contain almost identical puts()
> > implementations some of which also perform additional '\n' -> '\n\r'
> > compensation.
> >
> > Move all of that code into a central location and share as much of it
> > as possible.
> >
> > Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> > ---
> > common/console.c | 16 ----------
> > common/console_simple.c | 17 -----------
> > include/console.h | 3 +-
> > lib/console.c | 67 +++++++++++++++++++++++++++++++++++++++--
> > pbl/console.c | 13 --------
> > 5 files changed, 67 insertions(+), 49 deletions(-)
> >
> > diff --git a/common/console.c b/common/console.c
> > index ab3d4d397..d64a7be25 100644
> > --- a/common/console.c
> > +++ b/common/console.c
> > @@ -253,22 +253,6 @@ static void console_set_stdoutpath(struct console_device *cdev)
> > free(str);
> > }
> >
> > -static int __console_puts(struct console_device *cdev, const char *s)
> > -{
> > - int n = 0;
> > -
> > - while (*s) {
> > - if (*s == '\n') {
> > - cdev->putc(cdev, '\r');
> > - n++;
> > - }
> > - cdev->putc(cdev, *s);
> > - n++;
> > - s++;
> > - }
> > - return n;
> > -}
> > -
> > static int fops_open(struct cdev *cdev, unsigned long flags)
> > {
> > struct console_device *priv = cdev->priv;
> > diff --git a/common/console_simple.c b/common/console_simple.c
> > index d560f8534..898f68a48 100644
> > --- a/common/console_simple.c
> > +++ b/common/console_simple.c
> > @@ -9,23 +9,6 @@ LIST_HEAD(console_list);
> > EXPORT_SYMBOL(console_list);
> > extern struct console_device *console;
> >
> > -int console_puts(unsigned int ch, const char *str)
> > -{
> > - const char *s = str;
> > - int i = 0;
> > -
> > - while (*s) {
> > - console_putc(ch, *s);
> > - if (*s == '\n')
> > - console_putc(ch, '\r');
> > - s++;
> > - i++;
> > - }
> > -
> > - return i;
> > -}
> > -EXPORT_SYMBOL(console_puts);
> > -
> > int tstc(void)
> > {
> > if (!console)
> > diff --git a/include/console.h b/include/console.h
> > index b3001ad16..81a5a5534 100644
> > --- a/include/console.h
> > +++ b/include/console.h
> > @@ -211,7 +211,8 @@ static inline void pbl_set_putc(putc_func_t putcf, void *ctx) {}
> > bool console_allow_color(void);
> >
> > void __cdev_putc(struct console_device *cdev, char c);
> > -void __console_putc(struct console_device *cdev, char c);
> > +int __console_putc(struct console_device *cdev, char c);
> > +int __console_puts(struct console_device *cdev, const char *str);
> >
> > struct console_device *__console_get_default(void);
> > void __console_set_putc(struct console_device *cdev,
> > diff --git a/lib/console.c b/lib/console.c
> > index 94c20dada..9f0fa9fc9 100644
> > --- a/lib/console.c
> > +++ b/lib/console.c
> > @@ -121,15 +121,78 @@ void __cdev_putc(struct console_device *cdev, char c)
> > *
> > * Internal high-level putc() implementation based on __cdev_putc()
> > * that performs correct '\n' -> '\n\r' substitution.
> > + *
> > + * Function returns number of printed characters
> > */
> > -void __console_putc(struct console_device *cdev, char c)
> > +int __console_putc(struct console_device *cdev, char c)
> > {
> > + int n = 0;
> > +
> > __cdev_putc(cdev, c);
> > - if (c == '\n')
> > + n++;
> > + if (c == '\n') {
> > __cdev_putc(cdev, '\r');
> > + n++;
> > + }
> > +
> > + return n;
> > }
>
> The correct line ending is "\r\n", not the other way round. Please use
> that one.
>
Sure, will do in v2.
> >
> > +/**
> > + * console_putc - Default console_putc() implementation
> > + *
> > + * @cdev: Console device to use
>
> There is no @cdev parameter to this function.
>
Yeah, will fix in v2.
> > + * @c: Character to print
> > + *
> > + * This is default console_putc() implementation used as is by PBL and
> > + * CONSOLE_SIMPLE. Declared as __weak in order to allow other
> > + * implementation to override it.
> > + */
> > __weak void console_putc(unsigned int ch, char c)
> > {
> > __console_putc(__console_get_default(), c);
> > }
> > +
> > +/**
> > + * console_puts - Default console_puts() implementation
> > + *
> > + * @cdev: Console device to use
>
> ditto.
>
Will fix in v2.
Thanks,
Andrey Smirnov
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
