From owner-p4-projects@FreeBSD.ORG Tue Apr 8 18:49:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F23B737B404; Tue, 8 Apr 2003 18:49:22 -0700 (PDT) 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 7BF2B37B401 for ; Tue, 8 Apr 2003 18:49:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1734E43F75 for ; Tue, 8 Apr 2003 18:49:22 -0700 (PDT) (envelope-from peter@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 h391nL0U020526 for ; Tue, 8 Apr 2003 18:49:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h391nLql020523 for perforce@freebsd.org; Tue, 8 Apr 2003 18:49:21 -0700 (PDT) Date: Tue, 8 Apr 2003 18:49:21 -0700 (PDT) Message-Id: <200304090149.h391nLql020523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 28590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Apr 2003 01:49:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=28590 Change 28590 by peter@peter_daintree on 2003/04/08 18:48:34 make syscons/fb/vga probe/attach. XXX more work needed. There is some nasty stuff where alpha has a copy of machine/pc/bios.h simply because it describes how to convert a physical address in the isa hole to virtual. I've deliberately left this broken to remind me. Affected files ... .. //depot/projects/hammer/sys/dev/fb/fbreg.h#4 edit .. //depot/projects/hammer/sys/dev/fb/vga.c#7 edit .. //depot/projects/hammer/sys/isa/vga_isa.c#4 edit Differences ... ==== //depot/projects/hammer/sys/dev/fb/fbreg.h#4 (text+ko) ==== @@ -44,6 +44,14 @@ void generic_bcopy(const void *s, void *d, size_t c); void generic_bzero(void *d, size_t c); #else /* !__i386__ */ +#ifdef __x86_64__ +#define bcopy_io(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bcopy_toio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bcopy_fromio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) +#define bzero_io(d, c) bzero((void *)(d), (c)) +#define fill_io(p, d, c) fill((p), (void *)(d), (c)) +#define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) +#else #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) #define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c)) #define bcopy_fromio(s, d, c) memcpy_fromio((void *)(d), (s), (c)) @@ -51,6 +59,7 @@ #define fill_io(p, d, c) memset_io((d), (p), (c)) #define fillw(p, d, c) memsetw((d), (p), (c)) #define fillw_io(p, d, c) memsetw_io((d), (p), (c)) +#endif #endif /* !__i386__ */ /* video function table */ ==== //depot/projects/hammer/sys/dev/fb/vga.c#7 (text+ko) ==== @@ -46,7 +46,9 @@ #include #include +#ifdef __i386__ #include +#endif #include #include @@ -58,6 +60,7 @@ #define VGA_DEBUG 0 #endif +#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) int vga_probe_unit(int unit, video_adapter_t *buf, int flags) { @@ -143,7 +146,9 @@ /* LOW-LEVEL */ #include +#ifdef __i386__ #include +#endif #define probe_done(adp) ((adp)->va_flags & V_ADP_PROBED) #define init_done(adp) ((adp)->va_flags & V_ADP_INITIALIZED) @@ -163,7 +168,7 @@ #endif /* architecture dependent option */ -#if defined(__alpha__) || defined(__ia64__) +#ifndef __i386__ #define VGA_NO_BIOS 1 #endif @@ -1315,7 +1320,7 @@ return 0; } -#ifdef __i386__ /* XXX */ +#if defined(__i386__) || defined(__x86_64__) /* XXX */ static void fill(int val, void *d, size_t size) { @@ -1820,10 +1825,10 @@ set_font_mode(adp, buf); if (fontsize == 32) { - bcopy_fromio(segment + ch*32, data, fontsize*count); + bcopy_fromio((uintptr_t)segment + ch*32, data, fontsize*count); } else { for (c = ch; count > 0; ++c, --count) { - bcopy_fromio(segment + c*32, data, fontsize); + bcopy_fromio((uintptr_t)segment + c*32, data, fontsize); data += fontsize; } } @@ -1900,10 +1905,10 @@ set_font_mode(adp, buf); if (fontsize == 32) { - bcopy_toio(data, segment + ch*32, fontsize*count); + bcopy_toio(data, (uintptr_t)segment + ch*32, fontsize*count); } else { for (c = ch; count > 0; ++c, --count) { - bcopy_toio(data, segment + c*32, fontsize); + bcopy_toio(data, (uintptr_t)segment + c*32, fontsize); data += fontsize; } } ==== //depot/projects/hammer/sys/isa/vga_isa.c#4 (text+ko) ==== @@ -46,7 +46,9 @@ #include #include +#ifdef __i386__ #include +#endif #include #include