d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out a couple of i386 conditionals which aren't needed with the new

Browse Source 
syscons and fix a few printfs.

Reviewed by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
This commit is contained in:
dfr 1999-01-25 08:48:49 +00:00
parent 1d86dfa8fb
commit bb2f8b2776
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.sbin/vidcontrol/vidcontrol.c
View File

@ -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);
}
}