diff options
| author | dfr <dfr@FreeBSD.org> | 1999-01-25 08:48:49 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-01-25 08:48:49 +0000 |
| commit | 4770188a9f503fa764131ac80dbba8a0ebf3e9ce (patch) | |
| tree | b760eea1f206eb28ae196474466ff4b99cf1b088 /usr.sbin/vidcontrol | |
| parent | d58f08f33fcaeae672848d0b3824d05303a50b81 (diff) | |
| download | FreeBSD-src-4770188a9f503fa764131ac80dbba8a0ebf3e9ce.zip FreeBSD-src-4770188a9f503fa764131ac80dbba8a0ebf3e9ce.tar.gz | |
Back out a couple of i386 conditionals which aren't needed with the new
syscons and fix a few printfs.
Reviewed by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
Diffstat (limited to 'usr.sbin/vidcontrol')
| -rw-r--r-- | usr.sbin/vidcontrol/vidcontrol.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index 6583d9f..f9604fc 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -28,7 +28,7 @@ #ifndef lint static const char rcsid[] = - "$Id: vidcontrol.c,v 1.25 1999/01/11 03:20:32 yokota Exp $"; + "$Id: vidcontrol.c,v 1.26 1999/01/12 23:05:45 mjacob Exp $"; #endif /* not lint */ #include <ctype.h> @@ -431,11 +431,7 @@ static char void show_adapter_info(void) { -#ifdef __i386__ struct video_adapter_info ad; -#else - struct video_adapter ad; -#endif ad.va_index = 0; if (ioctl(0, CONS_ADPINFO, &ad)) { @@ -444,12 +440,8 @@ show_adapter_info(void) } printf("fb%d:\n", ad.va_index); -#ifdef __i386__ printf(" %.*s%d, type:%s%s (%d), flags:0x%x\n", (int)sizeof(ad.va_name), ad.va_name, ad.va_unit, -#else - printf(" type:%s%s (%d), flags:0x%x\n", -#endif (ad.va_flags & V_ADP_VESA) ? "VESA " : "", adapter_name(ad.va_type), ad.va_type, ad.va_flags); printf(" initial mode:%d, current mode:%d, BIOS mode:%d\n", @@ -490,10 +482,10 @@ show_mode_info(void) info.vi_cwidth, info.vi_cheight); printf(" %-5s", buf); printf(" 0x%05x %2dk %2dk", - info.vi_window, info.vi_window_size/1024, - info.vi_window_gran/1024); + info.vi_window, (int)info.vi_window_size/1024, + (int)info.vi_window_gran/1024); printf(" 0x%08x %2dk\n", - info.vi_buffer, info.vi_buffer_size/1024); + info.vi_buffer, (int)info.vi_buffer_size/1024); } } |
