From owner-p4-projects  Thu Nov 28 11:12:40 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EB5D737B404; Thu, 28 Nov 2002 11:12:37 -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 8225B37B401
	for <perforce@freebsd.org>; Thu, 28 Nov 2002 11:12:37 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 38A5C43EAF
	for <perforce@freebsd.org>; Thu, 28 Nov 2002 11:12:37 -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 gASJ8qmV092678
	for <perforce@freebsd.org>; Thu, 28 Nov 2002 11:08:52 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gASJ8pFc092675
	for perforce@freebsd.org; Thu, 28 Nov 2002 11:08:51 -0800 (PST)
Date: Thu, 28 Nov 2002 11:08:51 -0800 (PST)
Message-Id: <200211281908.gASJ8pFc092675@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 21643 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21643

Change 21643 by marcel@marcel_nfs on 2002/11/28 11:08:12

	Conditionally compile-out I/O port addresses and memory addresses
	in structs. Use tags and handles instead (as much as possible).
	Not the final state, but compilable and useable.

Affected files ...

.. //depot/projects/ia64/sys/sys/fbio.h#3 edit

Differences ...

==== //depot/projects/ia64/sys/sys/fbio.h#3 (text+ko) ====

@@ -42,6 +42,7 @@
 #ifndef _SYS_FBIO_H_
 #define _SYS_FBIO_H_
 
+#include <machine/bus.h>
 #ifndef _KERNEL
 #include <sys/types.h>
 #endif
@@ -331,6 +332,7 @@
 #define V_ADP_INITIALIZED (1 << 17)
 #define V_ADP_REGISTERED (1 << 18)
 #define V_ADP_ATTACHED	(1 << 19)
+#if !defined(__ia64__)
     vm_offset_t		va_io_base;
     int			va_io_size;
     vm_offset_t		va_crtc_addr;
@@ -345,6 +347,13 @@
     int			va_initial_mode;
     int			va_initial_bios_mode;
     int			va_mode;
+#else
+    bus_space_tag_t	va_crtc_tag;
+    bus_space_handle_t	va_crtc_handle;
+    vm_offset_t		va_window;	/* virtual address */
+    size_t		va_window_size;
+    int			va_initial_mode;
+#endif
     struct video_info	va_info;
     int			va_line_width;
     struct {
@@ -356,8 +365,10 @@
     int			va_little_bitian;
     int			va_little_endian;
     int			va_buffer_alias;
+#if !defined(__ia64__)
     vm_offset_t		va_registers;	/* virtual address */
     vm_offset_t		va_registers_size;
+#endif
 };
 typedef struct video_adapter video_adapter_t;
 
@@ -367,6 +378,7 @@
     char		va_name[16];
     int			va_unit;
     int			va_flags;
+#if !defined(__ia64__)
     vm_offset_t		va_io_base;
     int			va_io_size;
     vm_offset_t		va_crtc_addr;
@@ -380,6 +392,7 @@
     int			va_initial_mode;
     int			va_initial_bios_mode;
     int			va_mode;
+#endif
     int			va_line_width;
     struct {
 	int		x;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message