Date: Thu, 28 Nov 2002 11:08:51 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21643 for review Message-ID: <200211281908.gASJ8pFc092675@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211281908.gASJ8pFc092675>