From owner-p4-projects Thu Nov 28 11: 3:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBC1937B404; Thu, 28 Nov 2002 11:03:24 -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 5431837B401 for ; Thu, 28 Nov 2002 11:03:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E11CF43ECD for ; Thu, 28 Nov 2002 11:03:23 -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 gASIxcmV091895 for ; Thu, 28 Nov 2002 10:59:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASIxcRV091892 for perforce@freebsd.org; Thu, 28 Nov 2002 10:59:38 -0800 (PST) Date: Thu, 28 Nov 2002 10:59:38 -0800 (PST) Message-Id: <200211281859.gASIxcRV091892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21640 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=21640 Change 21640 by marcel@marcel_nfs on 2002/11/28 10:59:22 Conditionally compile-out references to non-newbus compatible fields in the adapter and adapter_info structs on ia64. This is only in userland interfaces (ioctl). Affected files ... .. //depot/projects/ia64/sys/dev/fb/fb.c#3 edit Differences ... ==== //depot/projects/ia64/sys/dev/fb/fb.c#3 (text+ko) ==== @@ -637,10 +637,11 @@ printf("%s%d: %s%d, %s, type:%s (%d), flags:0x%x\n", FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name, adapter_name(adp->va_type), adp->va_type, adp->va_flags); +#if !defined(__ia64__) printf("%s%d: port:0x%lx-0x%lx, crtc:0x%lx, mem:0x%lx 0x%x\n", - FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, + FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, (u_long)adp->va_io_base + adp->va_io_size - 1, - (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base, + (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base, adp->va_mem_size); printf("%s%d: init mode:%d, bios mode:%d, current mode:%d\n", FB_DRIVER_NAME, adp->va_index, @@ -650,6 +651,7 @@ (void *)adp->va_window, (int)adp->va_window_size/1024, (int)adp->va_window_gran/1024, (void *)adp->va_buffer, (int)adp->va_buffer_size/1024); +#endif } void @@ -726,6 +728,7 @@ sizeof(((video_adapter_info_t *)arg)->va_name))); ((video_adapter_info_t *)arg)->va_unit = adp->va_unit; ((video_adapter_info_t *)arg)->va_flags = adp->va_flags; +#if !defined(__ia64__) ((video_adapter_info_t *)arg)->va_io_base = adp->va_io_base; ((video_adapter_info_t *)arg)->va_io_size = adp->va_io_size; ((video_adapter_info_t *)arg)->va_crtc_addr = adp->va_crtc_addr; @@ -756,6 +759,7 @@ = adp->va_initial_mode; ((video_adapter_info_t *)arg)->va_initial_bios_mode = adp->va_initial_bios_mode; +#endif ((video_adapter_info_t *)arg)->va_line_width = adp->va_line_width; ((video_adapter_info_t *)arg)->va_disp_start.x @@ -764,17 +768,18 @@ = adp->va_disp_start.y; break; +#if !defined(__ia64__) case FBIO_MODEINFO: /* get mode information */ - error = (*vidsw[adp->va_index]->get_info)(adp, + error = (*vidsw[adp->va_index]->get_info)(adp, ((video_info_t *)arg)->vi_mode, - (video_info_t *)arg); + (video_info_t *)arg); if (error) error = ENODEV; break; case FBIO_FINDMODE: /* find a matching video mode */ - error = (*vidsw[adp->va_index]->query_mode)(adp, - (video_info_t *)arg); + error = (*vidsw[adp->va_index]->query_mode)(adp, + (video_info_t *)arg); break; case FBIO_GETMODE: /* get video mode */ @@ -790,6 +795,7 @@ case FBIO_GETWINORG: /* get frame buffer window origin */ *(u_int *)arg = adp->va_window_orig; break; +#endif case FBIO_GETDISPSTART: /* get display start address */ ((video_display_start_t *)arg)->x = adp->va_disp_start.x; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message