From aed742c9a09fc443418ba4ef8f31892ef00df984 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 16 Apr 2004 12:06:28 +0000 Subject: Remove stray white spaces. --- cpukit/libmisc/serdbg/serdbg.c | 8 ++++---- cpukit/libmisc/serdbg/serdbg.h | 4 ++-- cpukit/libmisc/serdbg/serdbgcnf.h | 4 ++-- cpukit/libmisc/serdbg/serdbgio.c | 26 +++++++++++++------------- cpukit/libmisc/serdbg/termios_printk.c | 22 +++++++++++----------- cpukit/libmisc/serdbg/termios_printk.h | 2 +- cpukit/libmisc/serdbg/termios_printk_cnf.h | 4 ++-- 7 files changed, 35 insertions(+), 35 deletions(-) (limited to 'cpukit/libmisc/serdbg') diff --git a/cpukit/libmisc/serdbg/serdbg.c b/cpukit/libmisc/serdbg/serdbg.c index 4df5a0086e..4bca324934 100644 --- a/cpukit/libmisc/serdbg/serdbg.c +++ b/cpukit/libmisc/serdbg/serdbg.c @@ -16,7 +16,7 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | 04.04.02 creation doe | \*===============================================================*/ -/* +/* * $Id$ */ @@ -60,11 +60,11 @@ int serdbg_init_dbg return RTEMS_SUCCESSFUL; } is_initialized = TRUE; - /* + /* * try to open serial device */ if (rc == RTEMS_SUCCESSFUL) { - if ((serdbg_conf.open_io != NULL) && + if ((serdbg_conf.open_io != NULL) && (0 > serdbg_conf.open_io(serdbg_conf.devname,serdbg_conf.baudrate))) { fprintf(stderr, "remote_gdb_init: cannot open device %s " @@ -81,7 +81,7 @@ int serdbg_init_dbg /* * now activate gdb stub */ - if ((rc == RTEMS_SUCCESSFUL) && + if ((rc == RTEMS_SUCCESSFUL) && !serdbg_conf.skip_init_bkpt) { breakpoint(); } diff --git a/cpukit/libmisc/serdbg/serdbg.h b/cpukit/libmisc/serdbg/serdbg.h index b70033f4f9..00d5d827e1 100644 --- a/cpukit/libmisc/serdbg/serdbg.h +++ b/cpukit/libmisc/serdbg/serdbg.h @@ -16,8 +16,8 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | 04.04.02 creation doe | \*===============================================================*/ -/* - * $Id$ +/* + * $Id$ */ #ifndef _SERDBG_H #define _SERDBG_H diff --git a/cpukit/libmisc/serdbg/serdbgcnf.h b/cpukit/libmisc/serdbg/serdbgcnf.h index 9d8db06864..024e545d5c 100644 --- a/cpukit/libmisc/serdbg/serdbgcnf.h +++ b/cpukit/libmisc/serdbg/serdbgcnf.h @@ -16,7 +16,7 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | 13.05.02 creation doe | \*===============================================================*/ -/* +/* * $Id$ */ #ifndef _SERDBGCNF_H @@ -59,7 +59,7 @@ serdbg_conf_t serdbg_conf = { #endif CONFIGURE_SERDBG_DEVNAME, - + #ifdef CONFIGURE_SERDBG_SKIP_INIT_BKPT TRUE, #else diff --git a/cpukit/libmisc/serdbg/serdbgio.c b/cpukit/libmisc/serdbg/serdbgio.c index 3cebca02ff..494a2fab0b 100644 --- a/cpukit/libmisc/serdbg/serdbgio.c +++ b/cpukit/libmisc/serdbg/serdbgio.c @@ -106,7 +106,7 @@ int serdbg_open * open device for serdbg operation * skip any fds that are between 0..2, because they are * reserved for stdin/out/err - */ + */ if (!err_occurred && (dev_name != NULL) && (dev_name[0] != '\0')) { @@ -125,7 +125,7 @@ int serdbg_open } } } - } while (!err_occurred && + } while (!err_occurred && (serdbg_fd < 3)); } /* @@ -137,14 +137,14 @@ int serdbg_open } /* - * capture tty structure + * capture tty structure */ if (!err_occurred) { iop = &rtems_libio_iops[serdbg_fd]; serdbg_tty = iop->data1; } /* - * set device baudrate + * set device baudrate * (and transp mode, this is not really needed) * ... */ @@ -156,12 +156,12 @@ int serdbg_open err_occurred = TRUE; } if (!err_occurred) { - act_termios.c_iflag + act_termios.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP |INLCR|IGNCR|ICRNL|IXON); - act_termios.c_oflag + act_termios.c_oflag &= ~OPOST; - + act_termios.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); @@ -172,8 +172,8 @@ int serdbg_open err_occurred = TRUE; } } - return (err_occurred - ? -1 + return (err_occurred + ? -1 : 0); } @@ -197,7 +197,7 @@ void putDebugChar \*=========================================================================*/ { /* - * call serdbg polling callout, if available + * call serdbg polling callout, if available */ if (serdbg_conf.callout != NULL) { serdbg_conf.callout(); @@ -205,7 +205,7 @@ void putDebugChar /* * check, whether debug serial port is available */ - if ((serdbg_tty != NULL) && + if ((serdbg_tty != NULL) && (serdbg_tty->device.write != NULL)) { /* * send character to debug serial port @@ -237,11 +237,11 @@ int getDebugChar /* * check, whether debug serial port is available */ - if ((serdbg_tty != NULL) && + if ((serdbg_tty != NULL) && (serdbg_tty->device.pollRead != NULL)) { do { /* - * call serdbg polling callout, if available + * call serdbg polling callout, if available */ if (serdbg_conf.callout != NULL) { serdbg_conf.callout(); diff --git a/cpukit/libmisc/serdbg/termios_printk.c b/cpukit/libmisc/serdbg/termios_printk.c index 89fba880d9..6e31bbcfd0 100644 --- a/cpukit/libmisc/serdbg/termios_printk.c +++ b/cpukit/libmisc/serdbg/termios_printk.c @@ -73,10 +73,10 @@ void termios_printk_outputchar * check, whether printk serial port is available */ - if ((termios_printk_tty != NULL) && + if ((termios_printk_tty != NULL) && (termios_printk_tty->device.write != NULL)) { /* - * call termios_printk polling callout, if available + * call termios_printk polling callout, if available */ if (termios_printk_conf.callout != NULL) { termios_printk_conf.callout(); @@ -84,7 +84,7 @@ void termios_printk_outputchar /* * send character to debug serial port */ - if (c == '\n') { + if (c == '\n') { termios_printk_tty->device.write(termios_printk_tty->minor,&cr,1); } termios_printk_tty->device.write(termios_printk_tty->minor,&c,1); @@ -113,11 +113,11 @@ char termios_printk_inputchar /* * check, whether debug serial port is available */ - if ((termios_printk_tty != NULL) && + if ((termios_printk_tty != NULL) && (termios_printk_tty->device.pollRead != NULL)) { do { /* - * call termios_printk polling callout, if available + * call termios_printk polling callout, if available */ if (termios_printk_conf.callout != NULL) { termios_printk_conf.callout(); @@ -156,7 +156,7 @@ int termios_printk_open rtems_libio_t *iop = NULL; struct termios act_termios; tcflag_t baudcode = B0; - + if (termios_printk_fd >= 0) { /* * already initialized @@ -190,7 +190,7 @@ int termios_printk_open } /* * open device for serdbg operation - */ + */ if (!err_occurred && (dev_name != NULL) && (dev_name[0] != '\0')) { @@ -200,14 +200,14 @@ int termios_printk_open } } /* - * capture tty structure + * capture tty structure */ if (!err_occurred) { iop = &rtems_libio_iops[termios_printk_fd]; termios_printk_tty = iop->data1; } /* - * set device baudrate + * set device baudrate * (and transp mode, this is not really needed) * ... */ @@ -231,7 +231,7 @@ int termios_printk_open BSP_output_char = termios_printk_outputchar; BSP_poll_char = termios_printk_inputchar; } - return (err_occurred - ? -1 + return (err_occurred + ? -1 : 0); } diff --git a/cpukit/libmisc/serdbg/termios_printk.h b/cpukit/libmisc/serdbg/termios_printk.h index 184ec77162..d3a3703b11 100644 --- a/cpukit/libmisc/serdbg/termios_printk.h +++ b/cpukit/libmisc/serdbg/termios_printk.h @@ -16,7 +16,7 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | 13.04.02 creation doe | \*===============================================================*/ -/* +/* * $Id$ */ #ifndef _TERMIOS_PRINTK_H diff --git a/cpukit/libmisc/serdbg/termios_printk_cnf.h b/cpukit/libmisc/serdbg/termios_printk_cnf.h index a08f7c57c4..55aea94d03 100644 --- a/cpukit/libmisc/serdbg/termios_printk_cnf.h +++ b/cpukit/libmisc/serdbg/termios_printk_cnf.h @@ -16,7 +16,7 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | 13.05.02 creation doe | \*===============================================================*/ -/* +/* * $Id$ */ #ifndef _TERMIOS_PRINTK_CNF_H @@ -52,7 +52,7 @@ termios_printk_conf_t termios_printk_conf = { #else NULL, #endif - CONFIGURE_TERMIOS_PRINTK_DEVNAME, + CONFIGURE_TERMIOS_PRINTK_DEVNAME, }; #endif -- cgit v1.2.3