From d1eacc02f13c5933ac2d8d1b94cd1212f1a1e59b Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Thu, 29 Mar 2012 15:47:29 +0000 Subject: [PATCH] Move tty_opened_ns() into syscons.c which is currently the only client of this macro. Suggested by: ed @ MFC after: 1 week --- sys/dev/syscons/syscons.c | 3 +++ sys/sys/tty.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 9d125d87cbd6..01b1150f5ee6 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -86,6 +86,9 @@ __FBSDID("$FreeBSD$"); #define KEYCODE_BS 0x0e /* "<-- Backspace" key, XXX */ +/* NULL-safe version of "tty_opened()" */ +#define tty_opened_ns(tp) ((tp) != NULL && tty_opened(tp)) + typedef struct default_attr { int std_color; /* normal hardware color */ int rev_color; /* reverse hardware color */ diff --git a/sys/sys/tty.h b/sys/sys/tty.h index a25bf882e212..42f264b9545d 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -197,8 +197,6 @@ void tty_hiwat_in_block(struct tty *tp); void tty_hiwat_in_unblock(struct tty *tp); dev_t tty_udev(struct tty *tp); #define tty_opened(tp) ((tp)->t_flags & TF_OPENED) -/* NULL-safe version of "tty_opened()" */ -#define tty_opened_ns(tp) ((tp) != NULL && tty_opened(tp)) #define tty_gone(tp) ((tp)->t_flags & TF_GONE) #define tty_softc(tp) ((tp)->t_devswsoftc) #define tty_devname(tp) devtoname((tp)->t_dev)