From 1c26e05f300fbf76cf8d06e742fc571e5365fda3 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 24 Oct 2010 02:35:17 +0200 Subject: [PATCH] remove unused SC_x (serial port names) defines Signed-off-by: Denys Vlasenko --- include/libbb.h | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/include/libbb.h b/include/libbb.h index c85dab282..bd1d586c7 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1668,46 +1668,27 @@ extern const char bb_default_login_shell[]; # define VC_4 "/dev/tty4" # define VC_5 "/dev/tty5" # define VC_FORMAT "/dev/tty%d" -#elif ENABLE_FEATURE_DEVFS /* from now on, assume Linux naming */ +#elif ENABLE_FEATURE_DEVFS +/*Linux, obsolete devfs names */ # define CURRENT_VC "/dev/vc/0" # define VC_1 "/dev/vc/1" # define VC_2 "/dev/vc/2" # define VC_3 "/dev/vc/3" # define VC_4 "/dev/vc/4" # define VC_5 "/dev/vc/5" -# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) -/* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their - respective serial ports .. as such, we can't use the common device paths for - these. -- PFM */ -# define SC_0 "/dev/ttsc/0" -# define SC_1 "/dev/ttsc/1" -# define SC_FORMAT "/dev/ttsc/%d" -# else -# define SC_0 "/dev/tts/0" -# define SC_1 "/dev/tts/1" -# define SC_FORMAT "/dev/tts/%d" -# endif # define VC_FORMAT "/dev/vc/%d" # define LOOP_FORMAT "/dev/loop/%d" # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1) # define LOOP_NAME "/dev/loop/" # define FB_0 "/dev/fb/0" #else +/*Linux, normal names */ # define CURRENT_VC "/dev/tty0" # define VC_1 "/dev/tty1" # define VC_2 "/dev/tty2" # define VC_3 "/dev/tty3" # define VC_4 "/dev/tty4" # define VC_5 "/dev/tty5" -# if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__) -# define SC_0 "/dev/ttySC0" -# define SC_1 "/dev/ttySC1" -# define SC_FORMAT "/dev/ttySC%d" -# else -# define SC_0 "/dev/ttyS0" -# define SC_1 "/dev/ttyS1" -# define SC_FORMAT "/dev/ttyS%d" -# endif # define VC_FORMAT "/dev/tty%d" # define LOOP_FORMAT "/dev/loop%d" # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)