common/console: coding style cleanup
PATCH 1/2 common/console: coding style cleanup
--- common/console.c | 97 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 47 deletions(-)
common/console.c +50 -47
@@ -106,39 +106,39 @@ int cd_count[MAX_FILES];* only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. */ -static int iomux_getc (void ) +static int iomux_getc (void ) {unsigned char ret;/* This is never called with testcdev == NULL */ - ret = tstcdev->getc (); + ret = tstcdev->getc (); tstcdev =NULL ;return ret; } -static int iomux_tstc (int file) +static int iomux_tstc (int file) {int i, ret;device_t *dev; -disable_ctrlc (1 ); +disable_ctrlc (1 );for (i =0 ; i < cd_count[file]; i++) { dev = console_devices[file][i];if (dev->tstc !=NULL ) { - ret = dev->tstc (); + ret = dev->tstc ();if (ret >0 ) { tstcdev = dev; -disable_ctrlc (0 ); +disable_ctrlc (0 );return ret; } } } -disable_ctrlc (0 ); +disable_ctrlc (0 );return 0 ; } -static void iomux_putc (int file,const char c) +static void iomux_putc (int file,const char c) {int i;device_t *dev;
@@ -146,11 +146,11 @@ static void iomux_putc(int file, const char c)for (i =0 ; i < cd_count[file]; i++) { dev = console_devices[file][i];if (dev->putc !=NULL ) - dev->putc (c); + dev->putc (c); } } -static void iomux_puts (int file,const char *s) +static void iomux_puts (int file,const char *s) {int i;device_t *dev;
@@ -158,7 +158,7 @@ static void iomux_puts(int file, const char *s)for (i =0 ; i < cd_count[file]; i++) { dev = console_devices[file][i];if (dev->puts !=NULL ) - dev->puts (s); + dev->puts (s); } }#endif /* defined(CONFIG_CONSOLE_MUX) */
@@ -195,14 +195,14 @@ int fgetc (int file)* check for that first. */ if (tstcdev !=NULL ) -return iomux_getc (); -iomux_tstc (file); +return iomux_getc (); +iomux_tstc (file);#ifdef CONFIG_WATCHDOG /* * If the watchdog must be rate-limited then it should * already be handled in board-specific code. */ -udelay (1 ); +udelay (1 ); #endif }#else
@@ -217,7 +217,7 @@ int ftstc (int file) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX ) -return iomux_tstc (file); +return iomux_tstc (file);#else return stdio_devices[file]->tstc ();#endif
@@ -229,7 +229,7 @@ void fputc (int file, const char c) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX ) -iomux_putc (file, c); +iomux_putc (file, c);#else stdio_devices[file]->putc (c);#endif
@@ -239,7 +239,7 @@ void fputs (int file, const char *s) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX ) -iomux_puts (file, s); +iomux_puts (file, s);#else stdio_devices[file]->puts (s);#endif
@@ -415,35 +415,36 @@ void clear_ctrlc (void)char screen[1024 ];char *cursor = screen;int once =0 ; -inline void dbg (const char *fmt, ...) +inline void dbg (const char *fmt, ...) {va_list args;uint i;char printbuffer[CONFIG_SYS_PBSIZE ];if (!once) { -memset (screen,0 ,sizeof (screen)); +memset (screen,0 ,sizeof (screen)); once++; } -va_start (args, fmt); +va_start (args, fmt);/* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i =vsprintf (printbuffer, fmt, args); -va_end (args); + i =vsprintf (printbuffer, fmt, args); +va_end (args); -if ((screen +sizeof (screen) -1 - cursor) <strlen (printbuffer)+1 ) { -memset (screen,0 ,sizeof (screen)); +if ((screen +sizeof (screen) -1 - cursor) + <strlen (printbuffer) +1 ) { +memset (screen,0 ,sizeof (screen)); cursor = screen; } -sprintf (cursor, printbuffer); - cursor +=strlen (printbuffer); +sprintf (cursor, printbuffer); + cursor +=strlen (printbuffer); }#else -inline void dbg (const char *fmt, ...) +inline void dbg (const char *fmt, ...) { }#endif
@@ -454,9 +455,9 @@ device_t *search_device (int flags, char *name) {device_t *dev; - dev =device_get_by_name (name); + dev =device_get_by_name (name); -if (dev && (dev->flags & flags)) +if (dev && (dev->flags & flags))return dev;return NULL ;
@@ -482,9 +483,9 @@ int console_assign (int file, char *devname)/* Check for valid device name */ - dev =search_device (flag, devname); + dev =search_device (flag, devname); -if (dev) +if (dev)return console_setfile (file, dev);return -1 ;
@@ -496,7 +497,7 @@ int console_init_f (void) gd->have_console =1 ;#ifdef CONFIG_SILENT_CONSOLE -if (getenv ("silent" ) !=NULL ) +if (getenv ("silent" ) !=NULL ) gd->flags |=GD_FLG_SILENT ;#endif
@@ -534,9 +535,9 @@ int console_init_r (void) outputdev =search_device (DEV_FLAGS_OUTPUT , stdoutname); errdev =search_device (DEV_FLAGS_OUTPUT , stderrname);#ifdef CONFIG_CONSOLE_MUX - iomux_err =iomux_doenv (stdin, stdinname); - iomux_err +=iomux_doenv (stdout, stdoutname); - iomux_err +=iomux_doenv (stderr, stderrname); + iomux_err =iomux_doenv (stdin, stdinname); + iomux_err +=iomux_doenv (stdout, stdoutname); + iomux_err +=iomux_doenv (stderr, stderrname);if (!iomux_err)/* Successful, so skip all the code below. */ goto done;
@@ -556,7 +557,7 @@ int console_init_r (void)if (outputdev !=NULL ) {#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdout, outputdev->name); +iomux_doenv (stdout, outputdev->name);#else console_setfile (stdout, outputdev);#endif
@@ -564,7 +565,7 @@ int console_init_r (void)if (errdev !=NULL ) {#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stderr, errdev->name); +iomux_doenv (stderr, errdev->name);#else console_setfile (stderr, errdev);#endif
@@ -572,7 +573,7 @@ int console_init_r (void)if (inputdev !=NULL ) {#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdin, inputdev->name); +iomux_doenv (stdin, inputdev->name);#else console_setfile (stdin, inputdev);#endif
@@ -591,7 +592,7 @@ done:puts ("No input devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdin); +iomux_printdevs (stdin);#else printf ("%s\n" , stdio_devices[stdin]->name);#endif
@@ -602,7 +603,7 @@ done:puts ("No output devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdout); +iomux_printdevs (stdout);#else printf ("%s\n" , stdio_devices[stdout]->name);#endif
@@ -613,7 +614,7 @@ done:puts ("No error devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stderr); +iomux_printdevs (stderr);#else printf ("%s\n" , stdio_devices[stderr]->name);#endif
@@ -642,20 +643,22 @@ int console_init_r (void) {device_t *inputdev =NULL , *outputdev =NULL ;int i; -struct list_head *list =device_get_list (); +struct list_head *list =device_get_list ();struct list_head *pos;device_t *dev;#ifdef CONFIG_SPLASH_SCREEN -/* suppress all output if splash screen is enabled and we have -a bmp to display */ -if (getenv ("splashimage" ) !=NULL ) +/* +* suppress all output if splash screen is enabled and we have +* a bmp to display +*/ +if (getenv ("splashimage" ) !=NULL ) gd->flags |=GD_FLG_SILENT ;#endif /* Scan devices looking for input and output devices */ -list_for_each (pos, list) { - dev =list_entry (pos, device_t, list); + list_for_each (pos, list) { + dev =list_entry (pos, device_t, list);if ((dev->flags &DEV_FLAGS_INPUT ) && (inputdev ==NULL )) { inputdev = dev;
Signature · 1 line
1.5.6.5
PATCH 2/2 common/console: avoid ifdef CONFIG_CONSOLE_MUX when it's possible
--- common/console.c | 108 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 52 deletions(-)
common/console.c +56 -52
@@ -106,7 +106,7 @@ int cd_count[MAX_FILES];* only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. */ -static int iomux_getc (void ) +static int console_getc (int file) {unsigned char ret;
@@ -116,7 +116,7 @@ static int iomux_getc (void)return ret; } -static int iomux_tstc (int file) +static int console_tstc (int file) {int i, ret;device_t *dev;
@@ -138,7 +138,7 @@ static int iomux_tstc (int file)return 0 ; } -static void iomux_putc (int file,const char c) +static void console_putc (int file,const char c) {int i;device_t *dev;
@@ -150,7 +150,7 @@ static void iomux_putc (int file, const char c) } } -static void iomux_puts (int file,const char *s) +static void console_puts (int file,const char *s) {int i;device_t *dev;
@@ -161,6 +161,46 @@ static void iomux_puts (int file, const char *s) dev->puts (s); } } + +static inline void console_printdevs (int file) +{ +iomux_printdevs (file); +} + +static inline void console_doenv (int file,device_t *dev) +{ +iomux_doenv (file, dev->name); +} +#else +static inline int console_getc (int file) +{ +return stdio_devices[file]->getc (); +} + +static inline int console_tstc (int file) +{ +return stdio_devices[file]->tstc (); +} + +static inline void console_putc (int file,const char c) +{ + stdio_devices[file]->putc (c); +} + +static inline void console_puts (int file,const char *s) +{ + stdio_devices[file]->puts (s); +} + +static inline void console_printdevs (int file) +{ +printf ("%s\n" , stdio_devices[file]->name); +} + +static inline void console_doenv (int file,device_t *dev) +{ +console_setfile (file, dev); +}#endif /* defined(CONFIG_CONSOLE_MUX) */ /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/
@@ -195,8 +235,8 @@ int fgetc (int file)* check for that first. */ if (tstcdev !=NULL ) -return iomux_getc (); -iomux_tstc (file); +return console_getc (file); +console_tstc (file);#ifdef CONFIG_WATCHDOG /* * If the watchdog must be rate-limited then it should
@@ -206,7 +246,7 @@ int fgetc (int file) #endif }#else -return stdio_devices[file]->getc (); +return console_getc (file);#endif }
@@ -216,11 +256,7 @@ int fgetc (int file)int ftstc (int file) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -return iomux_tstc (file); -#else -return stdio_devices[file]->tstc (); -#endif +return console_tstc (file);return -1 ; }
@@ -228,21 +264,13 @@ int ftstc (int file)void fputc (int file,const char c) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -iomux_putc (file, c); -#else - stdio_devices[file]->putc (c); -#endif +console_putc (file, c); }void fputs (int file,const char *s) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -iomux_puts (file, s); -#else - stdio_devices[file]->puts (s); -#endif +console_puts (file, s); }void fprintf (int file,const char *fmt, ...)
@@ -555,28 +583,16 @@ int console_init_r (void) }/* Initializes output console first */ if (outputdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdout, outputdev->name); -#else -console_setfile (stdout, outputdev); -#endif +console_doenv (stdout, outputdev); }if (errdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stderr, errdev->name); -#else -console_setfile (stderr, errdev); -#endif +console_doenv (stderr, errdev); }if (inputdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdin, inputdev->name); -#else -console_setfile (stdin, inputdev); -#endif +console_doenv (stdin, inputdev); }#ifdef CONFIG_CONSOLE_MUX
@@ -591,33 +607,21 @@ done:if (stdio_devices[stdin] ==NULL ) {puts ("No input devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdin); -#else -printf ("%s\n" , stdio_devices[stdin]->name); -#endif +console_printdevs (stdin); }puts ("Out: " );if (stdio_devices[stdout] ==NULL ) {puts ("No output devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdout); -#else -printf ("%s\n" , stdio_devices[stdout]->name); -#endif +console_printdevs (stdout); }puts ("Err: " );if (stdio_devices[stderr] ==NULL ) {puts ("No error devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stderr); -#else -printf ("%s\n" , stdio_devices[stderr]->name); -#endif +console_printdevs (stderr); }#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
Signature · 1 line
1.5.6.5
PATCH 2/2 common/console: avoid ifdef CONFIG_CONSOLE_MUX when it's possible
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- common/console.c | 108 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 52 deletions(-)
Does not apply without the rejcted whitespace-changing patch.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I'd rather be led to hell than managed to heaven.
Wolfgang Denk
NAKPATCH 1/2 common/console: coding style cleanup
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 15 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- common/console.c | 97 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 47 deletions(-)common/console.c +1
-1@@ -106,39 +106,39 @@ int cd_count[MAX_FILES];* only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. */ -static int iomux_getc (void ) +static int iomux_getc (void )
...
common/console.c int cd_count[MAX_FILES]; · line 119
Quoted 2 lines
common/console.c +1
-1-static int iomux_tstc (int file) +static int iomux_tstc (int file)
NAK.
This Linux kernel coding style does NOT insert spaces between function names; your patch makes the style worse, not better.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The human race is faced with a cruel choice: work or daytime tele- vision.
PATCH 1/2 common/console: coding style cleanup
Quoted 19 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 15 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- common/console.c | 97 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 47 deletions(-)common/console.c +1
-1@@ -106,39 +106,39 @@ int cd_count[MAX_FILES];* only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. */ -static int iomux_getc (void ) +static int iomux_getc (void )...
Quoted 7 lines
common/console.c int cd_count[MAX_FILES]; · line 119
Quoted 2 lines
common/console.c +1
-1-static int iomux_tstc (int file) +static int iomux_tstc (int file)NAK.
This Linux kernel coding style does NOT insert spaces between function names; your patch makes the style worse, not better.
It's the coding style use in this file
so what do you prefer?
Best Regards,
J.
PATCH 1/2 common/console: coding style cleanup
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 4 lines
Quoted 3 lines
common/console.c +1
-1-static int iomux_getc (void ) +static int iomux_getc (void )...
Quoted 8 lines
Quoted 7 lines
common/console.c int cd_count[MAX_FILES]; · line 119
Quoted 2 lines
common/console.c +1
-1-static int iomux_tstc (int file) +static int iomux_tstc (int file)NAK.
This Linux kernel coding style does NOT insert spaces between function names; your patch makes the style worse, not better.
It's the coding style use in this file
We have a mix of styles here, so if we change it, then please to the "right" way.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Given a choice between two theories, take the one which is funnier.
PATCH v2 1/2 common/console: coding style cleanup
In reply to Jean-Christophe PLAGNIOL-VILLARD--- common/console.c | 199 +++++++++++++++++++++++++++-------------------------- 1 files changed, 101 insertions(+), 98 deletions(-)
common/console.c +101 -98
@@ -40,15 +40,15 @@ int console_changed = 0;* environment are used */ #ifdef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE -extern int overwrite_console (void ); -#define OVERWRITE_CONSOLE overwrite_console () +extern int overwrite_console (void ); +#define OVERWRITE_CONSOLE overwrite_console()#else #define OVERWRITE_CONSOLE 0#endif /* CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE */ #endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */ -static int console_setfile (int file,device_t * dev) +static int console_setfile (int file,device_t * dev) {int error =0 ;
@@ -61,7 +61,7 @@ static int console_setfile (int file, device_t * dev)case stderr:/* Start new device */ if (dev->start) { - error = dev->start (); + error = dev->start ();/* If it's not started dont use it */ if (error <0 )break ;
@@ -165,24 +165,24 @@ static void iomux_puts(int file, const char *s)/** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/ -void serial_printf (const char *fmt, ...) +void serial_printf (const char *fmt, ...) {va_list args;uint i;char printbuffer[CONFIG_SYS_PBSIZE ]; -va_start (args, fmt); +va_start (args, fmt);/* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i =vsprintf (printbuffer, fmt, args); -va_end (args); + i =vsprintf (printbuffer, fmt, args); +va_end (args); -serial_puts (printbuffer); +serial_puts (printbuffer); } -int fgetc (int file) +int fgetc (int file) {if (file <MAX_FILES ) {#if defined(CONFIG_CONSOLE_MUX )
@@ -206,66 +206,66 @@ int fgetc (int file)#endif }#else -return stdio_devices[file]->getc (); +return stdio_devices[file]->getc ();#endif }return -1 ; } -int ftstc (int file) +int ftstc (int file) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX )return iomux_tstc (file);#else -return stdio_devices[file]->tstc (); +return stdio_devices[file]->tstc ();#endif return -1 ; } -void fputc (int file,const char c) +void fputc (int file,const char c) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX )iomux_putc (file, c);#else - stdio_devices[file]->putc (c); + stdio_devices[file]->putc (c);#endif } -void fputs (int file,const char *s) +void fputs (int file,const char *s) { if (file < MAX_FILES)#if defined(CONFIG_CONSOLE_MUX )iomux_puts (file, s);#else - stdio_devices[file]->puts (s); + stdio_devices[file]->puts (s);#endif } -void fprintf (int file,const char *fmt, ...) +void fprintf (int file,const char *fmt, ...) {va_list args;uint i;char printbuffer[CONFIG_SYS_PBSIZE ]; -va_start (args, fmt); +va_start (args, fmt);/* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i =vsprintf (printbuffer, fmt, args); -va_end (args); + i =vsprintf (printbuffer, fmt, args); +va_end (args);/* Send to desired file */ -fputs (file, printbuffer); +fputs (file, printbuffer); }/** U-Boot INITIAL CONSOLE-COMPATIBLE FUNCTION *****************************/ -int getc (void ) +int getc (void ) {#ifdef CONFIG_DISABLE_CONSOLE if (gd->flags &GD_FLG_DISABLE_CONSOLE )
@@ -274,14 +274,14 @@ int getc (void)if (gd->flags &GD_FLG_DEVINIT ) {/* Get from the standard input */ -return fgetc (stdin); +return fgetc (stdin); }/* Send directly to the handler */ -return serial_getc (); +return serial_getc (); } -int tstc (void ) +int tstc (void ) {#ifdef CONFIG_DISABLE_CONSOLE if (gd->flags &GD_FLG_DISABLE_CONSOLE )
@@ -290,14 +290,14 @@ int tstc (void)if (gd->flags &GD_FLG_DEVINIT ) {/* Test the standard input */ -return ftstc (stdin); +return ftstc (stdin); }/* Send directly to the handler */ -return serial_tstc (); +return serial_tstc (); } -void putc (const char c) +void putc (const char c) {#ifdef CONFIG_SILENT_CONSOLE if (gd->flags &GD_FLG_SILENT )
@@ -311,14 +311,14 @@ void putc (const char c)if (gd->flags &GD_FLG_DEVINIT ) {/* Send to the standard output */ -fputc (stdout, c); +fputc (stdout, c); }else {/* Send directly to the handler */ -serial_putc (c); +serial_putc (c); } } -void puts (const char *s) +void puts (const char *s) {#ifdef CONFIG_SILENT_CONSOLE if (gd->flags &GD_FLG_SILENT )
@@ -332,32 +332,32 @@ void puts (const char *s)if (gd->flags &GD_FLG_DEVINIT ) {/* Send to the standard output */ -fputs (stdout, s); +fputs (stdout, s); }else {/* Send directly to the handler */ -serial_puts (s); +serial_puts (s); } } -void printf (const char *fmt, ...) +void printf (const char *fmt, ...) {va_list args;uint i;char printbuffer[CONFIG_SYS_PBSIZE ]; -va_start (args, fmt); +va_start (args, fmt);/* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i =vsprintf (printbuffer, fmt, args); -va_end (args); + i =vsprintf (printbuffer, fmt, args); +va_end (args);/* Print the string */ -puts (printbuffer); +puts (printbuffer); } -void vprintf (const char *fmt,va_list args) +void vprintf (const char *fmt,va_list args) {uint i;char printbuffer[CONFIG_SYS_PBSIZE ];
@@ -365,20 +365,20 @@ void vprintf (const char *fmt, va_list args)/* For this to work, printbuffer must be larger than * anything we ever want to print. */ - i =vsprintf (printbuffer, fmt, args); + i =vsprintf (printbuffer, fmt, args);/* Print the string */ -puts (printbuffer); +puts (printbuffer); }/* test if ctrl-c was pressed */ static int ctrlc_disabled =0 ;/* see disable_ctrl() */ static int ctrlc_was_pressed =0 ; -int ctrlc (void ) +int ctrlc (void ) {if (!ctrlc_disabled && gd->have_console) { -if (tstc ()) { -switch (getc ()) { +if (tstc ()) { +switch (getc ()) {case 0x03 :/* ^C - Control C */ ctrlc_was_pressed =1 ;return 1 ;
@@ -393,7 +393,7 @@ int ctrlc (void)/* pass 1 to disable ctrlc() checking, 0 to enable. * returns previous state */ -int disable_ctrlc (int disable) +int disable_ctrlc (int disable) {int prev = ctrlc_disabled;/* save previous state */
@@ -406,7 +406,7 @@ int had_ctrlc (void)return ctrlc_was_pressed; } -void clear_ctrlc (void ) +void clear_ctrlc (void ) { ctrlc_was_pressed =0 ; }
@@ -434,7 +434,8 @@ inline void dbg(const char *fmt, ...) i =vsprintf (printbuffer, fmt, args);va_end (args); -if ((screen +sizeof (screen) -1 - cursor) <strlen (printbuffer)+1 ) { +if ((screen +sizeof (screen) -1 - cursor) + <strlen (printbuffer) +1 ) {memset (screen,0 ,sizeof (screen)); cursor = screen; }
@@ -450,19 +451,19 @@ inline void dbg(const char *fmt, ...)/** U-Boot INIT FUNCTIONS *************************************************/ -device_t *search_device (int flags,char *name) +device_t *search_device (int flags,char *name) {device_t *dev; dev =device_get_by_name (name); -if (dev && (dev->flags & flags)) +if (dev && (dev->flags & flags))return dev;return NULL ; } -int console_assign (int file,char *devname) +int console_assign (int file,char *devname) {int flag;device_t *dev;
@@ -484,14 +485,14 @@ int console_assign (int file, char *devname) dev =search_device (flag, devname); -if (dev) -return console_setfile (file, dev); +if (dev) +return console_setfile (file, dev);return -1 ; }/* Called before relocation - use serial functions */ -int console_init_f (void ) +int console_init_f (void ) { gd->have_console =1 ;
@@ -500,12 +501,12 @@ int console_init_f (void) gd->flags |=GD_FLG_SILENT ;#endif -return (0 ); +return 0 ; }#ifdef CONFIG_SYS_CONSOLE_IS_IN_ENV /* Called after the relocation - use desired console functions */ -int console_init_r (void ) +int console_init_r (void ) {char *stdinname, *stdoutname, *stderrname;device_t *inputdev =NULL , *outputdev =NULL , *errdev =NULL ;
@@ -525,14 +526,14 @@ int console_init_r (void)/* stdin stdout and stderr are in environment */ /* scan for it */ - stdinname =getenv ("stdin" ); - stdoutname =getenv ("stdout" ); - stderrname =getenv ("stderr" ); + stdinname =getenv ("stdin" ); + stdoutname =getenv ("stdout" ); + stderrname =getenv ("stderr" );if (OVERWRITE_CONSOLE ==0 ) {/* if not overwritten by config switch */ - inputdev =search_device (DEV_FLAGS_INPUT , stdinname); - outputdev =search_device (DEV_FLAGS_OUTPUT , stdoutname); - errdev =search_device (DEV_FLAGS_OUTPUT , stderrname); + inputdev =search_device (DEV_FLAGS_INPUT , stdinname); + outputdev =search_device (DEV_FLAGS_OUTPUT , stdoutname); + errdev =search_device (DEV_FLAGS_OUTPUT , stderrname);#ifdef CONFIG_CONSOLE_MUX iomux_err =iomux_doenv (stdin, stdinname); iomux_err +=iomux_doenv (stdout, stdoutname);
@@ -544,13 +545,13 @@ int console_init_r (void) }/* if the devices are overwritten or not found, use default device */ if (inputdev ==NULL ) { - inputdev =search_device (DEV_FLAGS_INPUT ,"serial" ); + inputdev =search_device (DEV_FLAGS_INPUT ,"serial" ); }if (outputdev ==NULL ) { - outputdev =search_device (DEV_FLAGS_OUTPUT ,"serial" ); + outputdev =search_device (DEV_FLAGS_OUTPUT ,"serial" ); }if (errdev ==NULL ) { - errdev =search_device (DEV_FLAGS_OUTPUT ,"serial" ); + errdev =search_device (DEV_FLAGS_OUTPUT ,"serial" ); }/* Initializes output console first */ if (outputdev !=NULL ) {
@@ -558,7 +559,7 @@ int console_init_r (void)/* need to set a console if not done above. */ iomux_doenv (stdout, outputdev->name);#else -console_setfile (stdout, outputdev); +console_setfile (stdout, outputdev);#endif }if (errdev !=NULL ) {
@@ -566,7 +567,7 @@ int console_init_r (void)/* need to set a console if not done above. */ iomux_doenv (stderr, errdev->name);#else -console_setfile (stderr, errdev); +console_setfile (stderr, errdev);#endif }if (inputdev !=NULL ) {
@@ -574,7 +575,7 @@ int console_init_r (void)/* need to set a console if not done above. */ iomux_doenv (stdin, inputdev->name);#else -console_setfile (stdin, inputdev); +console_setfile (stdin, inputdev);#endif }
@@ -586,36 +587,36 @@ done:#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET /* Print information */ -puts ("In: " ); +puts ("In: " );if (stdio_devices[stdin] ==NULL ) { -puts ("No input devices available!\n" ); +puts ("No input devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX iomux_printdevs (stdin);#else -printf ("%s\n" , stdio_devices[stdin]->name); +printf ("%s\n" , stdio_devices[stdin]->name);#endif } -puts ("Out: " ); +puts ("Out: " );if (stdio_devices[stdout] ==NULL ) { -puts ("No output devices available!\n" ); +puts ("No output devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX iomux_printdevs (stdout);#else -printf ("%s\n" , stdio_devices[stdout]->name); +printf ("%s\n" , stdio_devices[stdout]->name);#endif } -puts ("Err: " ); +puts ("Err: " );if (stdio_devices[stderr] ==NULL ) { -puts ("No error devices available!\n" ); +puts ("No error devices available!\n" ); }else {#ifdef CONFIG_CONSOLE_MUX iomux_printdevs (stderr);#else -printf ("%s\n" , stdio_devices[stderr]->name); +printf ("%s\n" , stdio_devices[stderr]->name);#endif }#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
@@ -623,22 +624,22 @@ done:#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */ for (i =0 ; i <3 ; i++) { -setenv (stdio_names[i], stdio_devices[i]->name); +setenv (stdio_names[i], stdio_devices[i]->name); }#endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */ #if 0 /* If nothing usable installed, use only the initial console */ if ((stdio_devices[stdin] ==NULL ) && (stdio_devices[stdout] ==NULL )) -return (0 ); +return 0 ;#endif - return (0); + return 0; }#else /* CONFIG_SYS_CONSOLE_IS_IN_ENV */ /* Called after the relocation - use desired console functions */ -int console_init_r (void ) +int console_init_r (void ) {device_t *inputdev =NULL , *outputdev =NULL ;int i;
@@ -647,8 +648,10 @@ int console_init_r (void)device_t *dev;#ifdef CONFIG_SPLASH_SCREEN -/* suppress all output if splash screen is enabled and we have -a bmp to display */ +/* +* suppress all output if splash screen is enabled and we have +* a bmp to display +*/ if (getenv ("splashimage" ) !=NULL ) gd->flags |=GD_FLG_SILENT ;#endif
@@ -669,8 +672,8 @@ int console_init_r (void)/* Initializes output console first */ if (outputdev !=NULL ) { -console_setfile (stdout, outputdev); -console_setfile (stderr, outputdev); +console_setfile (stdout, outputdev); +console_setfile (stderr, outputdev);#ifdef CONFIG_CONSOLE_MUX console_devices[stdout][0 ] = outputdev; console_devices[stderr][0 ] = outputdev;
@@ -679,7 +682,7 @@ int console_init_r (void)/* Initializes input console */ if (inputdev !=NULL ) { -console_setfile (stdin, inputdev); +console_setfile (stdin, inputdev);#ifdef CONFIG_CONSOLE_MUX console_devices[stdin][0 ] = inputdev;#endif
@@ -689,40 +692,40 @@ int console_init_r (void)#ifndef CONFIG_SYS_CONSOLE_INFO_QUIET /* Print information */ -puts ("In: " ); +puts ("In: " );if (stdio_devices[stdin] ==NULL ) { -puts ("No input devices available!\n" ); +puts ("No input devices available!\n" ); }else { -printf ("%s\n" , stdio_devices[stdin]->name); +printf ("%s\n" , stdio_devices[stdin]->name); } -puts ("Out: " ); +puts ("Out: " );if (stdio_devices[stdout] ==NULL ) { -puts ("No output devices available!\n" ); +puts ("No output devices available!\n" ); }else { -printf ("%s\n" , stdio_devices[stdout]->name); +printf ("%s\n" , stdio_devices[stdout]->name); } -puts ("Err: " ); +puts ("Err: " );if (stdio_devices[stderr] ==NULL ) { -puts ("No error devices available!\n" ); +puts ("No error devices available!\n" ); }else { -printf ("%s\n" , stdio_devices[stderr]->name); +printf ("%s\n" , stdio_devices[stderr]->name); }#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ /* Setting environment variables */ for (i =0 ; i <3 ; i++) { -setenv (stdio_names[i], stdio_devices[i]->name); +setenv (stdio_names[i], stdio_devices[i]->name); }#if 0 /* If nothing usable installed, use only the initial console */ if ((stdio_devices[stdin] ==NULL ) && (stdio_devices[stdout] ==NULL )) -return (0 ); +return 0 ;#endif - return (0); + return 0; }#endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */
Signature · 1 line
1.5.6.5
PATCH v2 2/2 common/console: avoid ifdef CONFIG_CONSOLE_MUX when it's possible
--- common/console.c | 108 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 52 deletions(-)
common/console.c +56 -52
@@ -106,7 +106,7 @@ int cd_count[MAX_FILES];* only from fgetc() which assures it. * No attempt is made to demultiplex multiple input sources. */ -static int iomux_getc (void ) +static int console_getc (int file) {unsigned char ret;
@@ -116,7 +116,7 @@ static int iomux_getc(void)return ret; } -static int iomux_tstc (int file) +static int console_tstc (int file) {int i, ret;device_t *dev;
@@ -138,7 +138,7 @@ static int iomux_tstc(int file)return 0 ; } -static void iomux_putc (int file,const char c) +static void console_putc (int file,const char c) {int i;device_t *dev;
@@ -150,7 +150,7 @@ static void iomux_putc(int file, const char c) } } -static void iomux_puts (int file,const char *s) +static void console_puts (int file,const char *s) {int i;device_t *dev;
@@ -161,6 +161,46 @@ static void iomux_puts(int file, const char *s) dev->puts(s); } } + +static inline void console_printdevs (int file) +{ +iomux_printdevs (file); +} + +static inline void console_doenv (int file,device_t *dev) +{ +iomux_doenv (file, dev->name); +} +#else +static inline int console_getc (int file) +{ +return stdio_devices[file]->getc (); +} + +static inline int console_tstc (int file) +{ +return stdio_devices[file]->tstc (); +} + +static inline void console_putc (int file,const char c) +{ + stdio_devices[file]->putc (c); +} + +static inline void console_puts (int file,const char *s) +{ + stdio_devices[file]->puts (s); +} + +static inline void console_printdevs (int file) +{ +printf ("%s\n" , stdio_devices[file]->name); +} + +static inline void console_doenv (int file,device_t *dev) +{ +console_setfile (file, dev); +}#endif /* defined(CONFIG_CONSOLE_MUX) */ /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/
@@ -195,8 +235,8 @@ int fgetc(int file)* check for that first. */ if (tstcdev !=NULL ) -return iomux_getc (); -iomux_tstc (file); +return console_getc (file); +console_tstc (file);#ifdef CONFIG_WATCHDOG /* * If the watchdog must be rate-limited then it should
@@ -206,7 +246,7 @@ int fgetc(int file) #endif }#else -return stdio_devices[file]->getc (); +return console_getc (file);#endif }
@@ -216,11 +256,7 @@ int fgetc(int file)int ftstc (int file) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -return iomux_tstc (file); -#else -return stdio_devices[file]->tstc (); -#endif +return console_tstc (file);return -1 ; }
@@ -228,21 +264,13 @@ int ftstc(int file)void fputc (int file,const char c) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -iomux_putc (file, c); -#else - stdio_devices[file]->putc (c); -#endif +console_putc (file, c); }void fputs (int file,const char *s) {if (file <MAX_FILES ) -#if defined(CONFIG_CONSOLE_MUX ) -iomux_puts (file, s); -#else - stdio_devices[file]->puts (s); -#endif +console_puts (file, s); }void fprintf (int file,const char *fmt, ...)
@@ -555,28 +583,16 @@ int console_init_r(void) }/* Initializes output console first */ if (outputdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdout, outputdev->name); -#else -console_setfile (stdout, outputdev); -#endif +console_doenv (stdout, outputdev); }if (errdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stderr, errdev->name); -#else -console_setfile (stderr, errdev); -#endif +console_doenv (stderr, errdev); }if (inputdev !=NULL ) { -#ifdef CONFIG_CONSOLE_MUX /* need to set a console if not done above. */ -iomux_doenv (stdin, inputdev->name); -#else -console_setfile (stdin, inputdev); -#endif +console_doenv (stdin, inputdev); }#ifdef CONFIG_CONSOLE_MUX
@@ -591,33 +607,21 @@ done:if (stdio_devices[stdin] ==NULL ) {puts ("No input devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdin); -#else -printf ("%s\n" , stdio_devices[stdin]->name); -#endif +console_printdevs (stdin); }puts ("Out: " );if (stdio_devices[stdout] ==NULL ) {puts ("No output devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stdout); -#else -printf ("%s\n" , stdio_devices[stdout]->name); -#endif +console_printdevs (stdout); }puts ("Err: " );if (stdio_devices[stderr] ==NULL ) {puts ("No error devices available!\n" ); }else { -#ifdef CONFIG_CONSOLE_MUX -iomux_printdevs (stderr); -#else -printf ("%s\n" , stdio_devices[stderr]->name); -#endif +console_printdevs (stderr); }#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
Signature · 1 line
1.5.6.5
Wolfgang Denk
AppliedPATCH v2 2/2 common/console: avoid ifdef CONFIG_CONSOLE_MUX when it's possible
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- common/console.c | 108 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 52 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Systems programmers are the high priests of a low cult.
-- R.S. BartonWolfgang Denk
AppliedPATCH v2 1/2 common/console: coding style cleanup
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- common/console.c | 199 +++++++++++++++++++++++++++-------------------------- 1 files changed, 101 insertions(+), 98 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Another megabytes the dust.