Date: Thu, 28 Nov 2002 14:41:27 -0500 From: Jake Burkholder <jake@locore.ca> To: Marcel Moolenaar <marcel@freebsd.org> Cc: Perforce Change Reviews <perforce@freebsd.org> Subject: Re: PERFORCE change 21643 for review Message-ID: <20021128144127.F4948@locore.ca> In-Reply-To: <200211281908.gASJ8pFc092675@repoman.freebsd.org>; from marcel@freebsd.org on Thu, Nov 28, 2002 at 11:08:51AM -0800 References: <200211281908.gASJ8pFc092675@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Apparently, On Thu, Nov 28, 2002 at 11:08:51AM -0800, Marcel Moolenaar said words to the effect of; > 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. Hi, It looks like we'll have to do a lot of the same stuff to get syscons to work on sparc64. It would be cool if you could take this into account when adding ifdefs not to make it so ia64 specific. Jake > > 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?20021128144127.F4948>