From owner-p4-projects Thu Nov 28 11: 9:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4C5737B404; Thu, 28 Nov 2002 11:09:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 352B037B43C for ; Thu, 28 Nov 2002 11:09:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C44C343EAF for ; Thu, 28 Nov 2002 11:09:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gASJ5lmV092265 for ; Thu, 28 Nov 2002 11:05:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ5lci092260 for perforce@freebsd.org; Thu, 28 Nov 2002 11:05:47 -0800 (PST) Date: Thu, 28 Nov 2002 11:05:47 -0800 (PST) Message-Id: <200211281905.gASJ5lci092260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21642 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21642 Change 21642 by marcel@marcel_nfs on 2002/11/28 11:05:24 Conditionally compile-out the compatibility structs on ia64. There's no compatibility to maintain and it's all non-newbus. This change breaks vidcontrol. Affected files ... .. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/syscons/scvidctl.c#4 (text+ko) ==== @@ -47,6 +47,7 @@ SET_DECLARE(scrndr_set, const sc_renderer_t); +#if !defined(__ia64__) /* for compatibility with previous versions */ /* 3.0-RELEASE used the following structure */ typedef struct old_video_adapter { @@ -126,6 +127,7 @@ #define OLD_CONS_MODEINFO _IOWR('c', 102, old_video_info_t) #define OLD_CONS_FINDMODE _IOWR('c', 103, old_video_info_t) +#endif int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize, @@ -457,7 +459,9 @@ scr_stat *scp; video_adapter_t *adp; video_info_t info; +#if !defined(__ia64__) video_adapter_info_t adp_info; +#endif int error; int s; @@ -478,6 +482,7 @@ case FBIO_ADPTYPE: return fb_ioctl(adp, FBIO_ADPTYPE, data); +#if !defined(__ia64__) case OLD_CONS_ADPINFO: /* adapter information (old interface) */ if (((old_video_adapter_t *)data)->va_index >= 0) { adp = vid_get_adapter(((old_video_adapter_t *)data)->va_index); @@ -510,6 +515,7 @@ if (error == 0) bcopy(&adp_info, data, sizeof(old_video_adapter_info_t)); return error; +#endif case CONS_ADPINFO: /* adapter information */ case FBIO_ADPINFO: @@ -539,17 +545,20 @@ return sc_set_text_mode(scp, tp, *(int *)data, 0, 0, 0); #endif /* SC_NO_MODE_CHANGE */ +#if !defined(__ia64__) case OLD_CONS_MODEINFO: /* get mode information (old infterface) */ info.vi_mode = ((old_video_info_t *)data)->vi_mode; error = fb_ioctl(adp, FBIO_MODEINFO, &info); if (error == 0) bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); return error; +#endif case CONS_MODEINFO: /* get mode information */ case FBIO_MODEINFO: return fb_ioctl(adp, FBIO_MODEINFO, data); +#if !defined(__ia64__) case OLD_CONS_FINDMODE: /* find a matching video mode (old interface) */ bzero(&info, sizeof(info)); bcopy((old_video_info_t *)data, &info, sizeof(old_video_info_t)); @@ -557,6 +566,7 @@ if (error == 0) bcopy(&info, (old_video_info_t *)data, sizeof(old_video_info_t)); return error; +#endif case CONS_FINDMODE: /* find a matching video mode */ case FBIO_FINDMODE: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message