From owner-freebsd-alpha Tue Jan 12 08:59:14 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA11553 for freebsd-alpha-outgoing; Tue, 12 Jan 1999 08:59:14 -0800 (PST) (envelope-from owner-freebsd-alpha@FreeBSD.ORG) Received: from outmail.utsunomiya-u.ac.jp (outmail.utsunomiya-u.ac.jp [160.12.196.3]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA11545 for ; Tue, 12 Jan 1999 08:59:11 -0800 (PST) (envelope-from yokota@zodiac.mech.utsunomiya-u.ac.jp) Received: from zodiac.mech.utsunomiya-u.ac.jp (IDENT:4YscsmpAikgauahih09OfGDQLeqOijmN@zodiac.mech.utsunomiya-u.ac.jp [160.12.42.1]) by outmail.utsunomiya-u.ac.jp (8.9.1/8.9.1) with ESMTP id BAA08746; Wed, 13 Jan 1999 01:58:30 +0900 (JST) Received: from zodiac.mech.utsunomiya-u.ac.jp (zodiac.mech.utsunomiya-u.ac.jp [160.12.42.1]) by zodiac.mech.utsunomiya-u.ac.jp (8.7.6+2.6Wbeta7/3.4W/zodiac-May96) with ESMTP id CAA03040; Wed, 13 Jan 1999 02:00:57 +0900 (JST) Message-Id: <199901121700.CAA03040@zodiac.mech.utsunomiya-u.ac.jp> To: mjacob@feral.com cc: alpha@FreeBSD.ORG, yokota@zodiac.mech.utsunomiya-u.ac.jp Subject: Re: broken builds? In-reply-to: Your message of "Tue, 12 Jan 1999 08:50:24 PST." References: Date: Wed, 13 Jan 1999 02:00:56 +0900 From: Kazutaka YOKOTA Sender: owner-freebsd-alpha@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >===> usr.sbin/kbdcontrol >cc -nostdinc -O -pipe -I/usr/obj/elf/usr/src/tmp/usr/include -c >/usr/src/usr.sbin/kbdcontrol/kbdcontrol.c >/usr/src/usr.sbin/kbdcontrol/kbdcontrol.c: > >ed inside parameter list >/usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:421: warning: its scope is only >this definition or declaration, >/usr/src/usr.sbin/kbdcontrol/kbdcontrol.c:421: warning: which is probably >not what you want. >/usr/src/usr.sbin/kbdcontrol/kbdcontrol.c: In function >`print_key_definition_line': > >Is this all because of the new kbd driver change? Sorry, I wan't careful enough. Please apply the following patch to kbdcontrol.c and vidcontrol.c. If it's Ok, I will commit them. Kazu Index: kbdcontrol.c =================================================================== RCS file: /src/CVS/src/usr.sbin/kbdcontrol/kbdcontrol.c,v retrieving revision 1.20 diff -u -r1.20 kbdcontrol.c --- kbdcontrol.c 1999/01/11 03:20:24 1.20 +++ kbdcontrol.c 1999/01/12 08:30:30 @@ -417,8 +417,13 @@ } +#ifdef __i386__ void print_key_definition_line(FILE *fp, int scancode, struct keyent_t *key) +#else +void +print_key_definition_line(FILE *fp, int scancode, struct key_t *key) +#endif { int i; @@ -866,6 +871,7 @@ warn("setting history buffer size"); } +#ifdef __i386__ static char *get_kbd_type_name(int type) { @@ -959,15 +965,22 @@ if (ioctl(0, CONS_RELKBD, 0) == -1) warn("unable to release the keyboard"); } +#endif /* __i386__ */ static void usage() { fprintf(stderr, "%s\n%s\n%s\n", +#ifdef __i386__ "usage: kbdcontrol [-dFKix] [-b duration.pitch | [quiet.]belltype]", " [-r delay.repeat | speed] [-l mapfile] [-f # string]", " [-h size] [-k device] [-L mapfile]"); +#else +"usage: kbdcontrol [-dFx] [-b duration.pitch | [quiet.]belltype]", +" [-r delay.repeat | speed] [-l mapfile] [-f # string]", +" [-h size] [-L mapfile]"); +#endif exit(1); } @@ -977,7 +990,11 @@ { int opt; +#ifdef __i386__ while((opt = getopt(argc, argv, "b:df:h:iKk:Fl:L:r:x")) != -1) +#else + while((opt = getopt(argc, argv, "b:df:h:Fl:L:r:x")) != -1) +#endif switch(opt) { case 'b': set_bell_values(optarg); @@ -1001,6 +1018,7 @@ case 'h': set_history(optarg); break; +#ifdef __i386__ case 'i': show_kbd_info(); break; @@ -1010,6 +1028,7 @@ case 'k': set_keyboard(optarg); break; +#endif /* __i386__ */ case 'r': set_keyrates(optarg); break; Index: vidcontrol.c =================================================================== RCS file: /src/CVS/src/usr.sbin/vidcontrol/vidcontrol.c,v retrieving revision 1.25 diff -u -r1.25 vidcontrol.c --- vidcontrol.c 1999/01/11 03:20:32 1.25 +++ vidcontrol.c 1999/01/12 08:38:33 @@ -431,7 +431,11 @@ 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)) { @@ -440,8 +444,12 @@ } 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", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message