Date: Sat, 13 Apr 2002 21:11:30 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9693 for review Message-ID: <200204140411.g3E4BUq73723@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9693 Change 9693 by jhb@jhb_laptop on 2002/04/13 21:10:40 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#42 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/alpha/include/endian.h#8 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#15 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#16 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#20 integrate ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#11 integrate ... //depot/projects/smpng/sys/conf/files#34 integrate ... //depot/projects/smpng/sys/conf/files.alpha#12 integrate ... //depot/projects/smpng/sys/conf/options.alpha#5 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#13 integrate ... //depot/projects/smpng/sys/dev/fb/fb.c#4 integrate ... //depot/projects/smpng/sys/dev/fb/fbreg.h#5 integrate ... //depot/projects/smpng/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/smpng/sys/dev/fb/tga.c#2 integrate ... //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#11 integrate ... //depot/projects/smpng/sys/dev/nge/if_ngereg.h#3 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#12 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#5 integrate ... //depot/projects/smpng/sys/dev/pci/pci_pci.c#8 integrate ... //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#18 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#32 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#10 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#6 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_status.c#11 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#12 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#28 integrate ... //depot/projects/smpng/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#59 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#32 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#15 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#20 integrate ... //depot/projects/smpng/sys/modules/wi/Makefile#5 integrate ... //depot/projects/smpng/sys/net/if_media.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/endian.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#26 integrate ... //depot/projects/smpng/sys/sys/fbio.h#3 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#9 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#7 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.4 2001/03/05 21:21:01 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ } alpha_instruction; -#endif !defined(ASSEMBLER) +#endif /* !defined(ASSEMBLER) */ /* * ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#42 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.177 2002/04/11 17:13:08 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.178 2002/04/13 23:37:10 alc Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1476,6 +1476,9 @@ #endif /* COMPAT_43 */ } +/* + * MPSAFE + */ int sigreturn(struct thread *td, struct sigreturn_args /* { ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#16 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.135 2002/04/03 10:56:54 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.136 2002/04/13 22:34:14 obrien Exp $ machine alpha cpu EV4 @@ -119,6 +119,7 @@ device psm # psm mouse device vga # VGA screen +device tga # TGA screen # splash screen/screen saver device splash ==== //depot/projects/smpng/sys/alpha/include/endian.h#8 (text+ko) ==== @@ -32,12 +32,13 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.10 2002/04/10 14:39:12 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.11 2002/04/12 15:56:44 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include <sys/cdefs.h> #include <machine/ansi.h> /* ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.29 2002/04/05 00:08:38 eric Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ */ ==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.6 2001/07/21 14:32:44 rnordier Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.7 2002/04/12 15:49:30 ru Exp $ -PROG= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -fno-builtin .if ${OBJFORMAT} == aout CFLAGS+=-O2 ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.50 2002/04/09 20:10:36 jhb Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.51 2002/04/13 23:09:41 jhb Exp $ */ #include <sys/param.h> ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.118 2002/04/11 21:00:05 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.119 2002/04/13 23:11:23 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.6 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.7 2002/04/13 23:11:23 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.621 2002/04/09 00:30:43 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.622 2002/04/12 06:19:18 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -629,6 +629,7 @@ dev/wi/if_wi_pccard.c optional wi pccard dev/wi/if_wi_pccard.c optional wi card dev/wi/if_wi_pci.c optional wi pci +dev/wi/wi_hostap.c optional wi dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card ==== //depot/projects/smpng/sys/conf/files.alpha#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.82 2002/03/27 05:39:16 dillon Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.83 2002/04/13 22:34:15 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -206,6 +206,7 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scterm-sc.c optional sc dev/syscons/scvgarndr.c optional sc vga +dev/syscons/scgfbrndr.c optional sc tga dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc @@ -222,3 +223,9 @@ libkern/alpha/bswap32.S standard libkern/bcmp.c standard libkern/ffs.c standard +dev/fb/tga.c optional tga +dev/fb/boot_font.c optional tga +dev/tga/tga_pci.c optional tga +dev/fb/fb.c optional tga +dev/fb/gfb.c optional tga +dev/gfb/gfb_pci.c optional tga ==== //depot/projects/smpng/sys/conf/options.alpha#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.alpha,v 1.33 2002/02/15 10:19:38 bde Exp $ +# $FreeBSD: src/sys/conf/options.alpha,v 1.34 2002/04/13 22:34:15 obrien Exp $ # Options specific to the Alpha platform kernels EV5 opt_global.h @@ -53,6 +53,14 @@ VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h +GFB_DEBUG opt_gfb.h +GFB_NO_FONT_LOADING opt_gfb.h +GFB_NO_MODE_CHANGE opt_gfb.h + +TGA_DEBUG opt_tga.h +TGA_NO_FONT_LOADING opt_tga.h +TGA_NO_MODE_CHANGE opt_tga.h + PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.46 2002/04/11 11:04:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.47 2002/04/12 14:10:19 sos Exp $ */ #include "opt_ata.h" @@ -122,7 +122,8 @@ switch(adp->device->channel->chiptype) { case 0x4d33105a: case 0x4d38105a: case 0x4d30105a: case 0x0d30105a: case 0x4d68105a: case 0x6268105a: - case 0x6269105a: + case 0x4d69105a: case 0x5275105a: case 0x6269105a: + /* test RAID bit in PCI reg XXX */ return (ar_promise_read_conf(adp, ar_table, 0)); ==== //depot/projects/smpng/sys/dev/fb/fb.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/fb.c,v 1.19 2001/09/12 08:37:03 julian Exp $ + * $FreeBSD: src/sys/dev/fb/fb.c,v 1.20 2002/04/13 22:34:15 obrien Exp $ */ #include "opt_fb.h" @@ -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); - printf("%s%d: port:0x%x-0x%x, crtc:0x%x, mem:0x%x 0x%x\n", - FB_DRIVER_NAME, adp->va_index, - adp->va_io_base, adp->va_io_base + adp->va_io_size - 1, - adp->va_crtc_addr, adp->va_mem_base, adp->va_mem_size); + 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, + (u_long)adp->va_io_base + adp->va_io_size - 1, + (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, adp->va_initial_mode, adp->va_initial_bios_mode, adp->va_mode); @@ -669,7 +670,7 @@ printf("T %dx%d, font:%dx%d, ", info->vi_width, info->vi_height, info->vi_cwidth, info->vi_cheight); - printf("win:0x%x\n", info->vi_window); + printf("win:0x%lx\n", (u_long)info->vi_window); } int ==== //depot/projects/smpng/sys/dev/fb/fbreg.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.10 2001/11/06 02:36:26 des Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.11 2002/04/13 22:34:15 obrien Exp $ */ #ifndef _DEV_FB_FBREG_H_ @@ -86,8 +86,21 @@ typedef int vi_clear_t(video_adapter_t *adp); typedef int vi_fill_rect_t(video_adapter_t *adp, int val, int x, int y, int cx, int cy); -typedef int vi_bitblt_t(video_adapter_t *adp,...); +typedef int vi_bitblt_t(video_adapter_t *adp, ...); typedef int vi_diag_t(video_adapter_t *adp, int level); +typedef int vi_save_cursor_palette_t(video_adapter_t *adp, u_char *palette); +typedef int vi_load_cursor_palette_t(video_adapter_t *adp, u_char *palette); +typedef int vi_copy_t(video_adapter_t *adp, vm_offset_t src, vm_offset_t dst, + int n); +typedef int vi_putp_t(video_adapter_t *adp, vm_offset_t off, u_int32_t p, + u_int32_t a, int size, int bpp, int bit_ltor, + int byte_ltor); +typedef int vi_putc_t(video_adapter_t *adp, vm_offset_t off, u_int8_t c, + u_int8_t a); +typedef int vi_puts_t(video_adapter_t *adp, vm_offset_t off, u_int16_t *s, + int len); +typedef int vi_putm_t(video_adapter_t *adp, int x, int y, + u_int8_t *pixel_image, u_int32_t pixel_mask, int size); typedef struct video_switch { vi_probe_t *probe; @@ -116,6 +129,13 @@ int (*reserved1)(void); int (*reserved2)(void); vi_diag_t *diag; + vi_save_cursor_palette_t *save_cursor_palette; + vi_load_cursor_palette_t *load_cursor_palette; + vi_copy_t *copy; + vi_putp_t *putp; + vi_putc_t *putc; + vi_puts_t *puts; + vi_putm_t *putm; } video_switch_t; #define save_palette(adp, pal) \ ==== //depot/projects/smpng/sys/dev/fb/gfb.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.1 2001/11/01 08:26:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.2 2002/04/13 22:34:15 obrien Exp $"); #include <machine/stdarg.h> @@ -541,7 +541,6 @@ int /*gfb_clear(video_adapter_t *adp, int n)*/ gfb_clear(video_adapter_t *adp) - video_adapter_t *adp; { int off; ==== //depot/projects/smpng/sys/dev/fb/tga.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.1 2001/11/01 08:26:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.2 2002/04/13 22:34:15 obrien Exp $"); #include <machine/stdarg.h> @@ -105,10 +105,12 @@ /* TGA-specific functionality. */ static gfb_builtin_save_palette_t tga_builtin_save_palette; static gfb_builtin_load_palette_t tga_builtin_load_palette; +#ifdef TGA2 static gfb_builtin_save_palette_t tga2_builtin_save_palette; static gfb_builtin_load_palette_t tga2_builtin_load_palette; static gfb_builtin_save_cursor_palette_t tga2_builtin_save_cursor_palette; static gfb_builtin_load_cursor_palette_t tga2_builtin_load_cursor_palette; +#endif static gfb_builtin_read_hw_cursor_t tga_builtin_read_hw_cursor; static gfb_builtin_set_hw_cursor_t tga_builtin_set_hw_cursor; static gfb_builtin_set_hw_cursor_shape_t tga_builtin_set_hw_cursor_shape; @@ -128,8 +130,10 @@ /* RAMDAC-specific functions */ static gfb_ramdac_init_t bt463_init; static void bt463_update_window_type(struct gfb_softc *); +#if 0 static gfb_ramdac_save_palette_t bt463_save_palette; static gfb_ramdac_load_palette_t bt463_load_palette; +#endif static gfb_ramdac_save_cursor_palette_t bt463_save_cursor_palette; static gfb_ramdac_load_cursor_palette_t bt463_load_cursor_palette; static gfb_ramdac_init_t bt485_init; @@ -150,7 +154,9 @@ static vi_query_mode_t tga_query_mode; static vi_set_mode_t tga_set_mode; static vi_blank_display_t tga_blank_display; +#if 0 static vi_ioctl_t tga_ioctl; +#endif static vi_set_border_t tga_set_border; static vi_set_win_org_t tga_set_win_org; static vi_fill_rect_t tga_fill_rect; @@ -670,7 +676,7 @@ /* Assume the best... */ error = 0; - gder = READ_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER); + gder = READ_GFB_REGISTER(adp, TGA_REG_GDER); /* Determine the adapter type first @@ -686,13 +692,13 @@ switch(mode) { case TGA2_2DA_MODE: vgae_mask = ~0x00400000; - WRITE_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER, + WRITE_GFB_REGISTER(adp, TGA_REG_GDER, gder & vgae_mask); adp->va_mode = mode; break; case TGA2_VGA_MODE: vgae_mask = 0x00400000; - WRITE_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER, + WRITE_GFB_REGISTER(adp, TGA_REG_GDER, gder | vgae_mask); adp->va_mode = mode; break; @@ -757,6 +763,8 @@ return(0); } +#if 0 + static int tga_ioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) { @@ -784,6 +792,8 @@ return(error); } +#endif /* 0 */ + static int tga_set_border(video_adapter_t *adp, int color) { return(ENODEV); @@ -916,7 +926,7 @@ static int #if 0 tga_clear(video_adapter_t *adp, int n) -else +#else tga_clear(video_adapter_t *adp) #endif { @@ -1410,6 +1420,7 @@ return(error); } +#ifdef TGA2 static int tga2_builtin_save_palette(video_adapter_t *adp, video_color_palette_t *palette) { @@ -1512,8 +1523,10 @@ return(error); } +#endif /* TGA2 */ + static int -tga_builtin_read_hw_cursor(video_adapter_t *adp, int col, int row) +tga_builtin_read_hw_cursor(video_adapter_t *adp, int *col, int *row) { gfb_reg_t cxyr; int error; @@ -1969,6 +1982,7 @@ } } +#if 0 static int bt463_save_palette(video_adapter_t *adp, video_color_palette_t *palette) { @@ -2016,6 +2030,8 @@ return(error); } +#endif /* 0 */ + static int bt463_save_cursor_palette(video_adapter_t *adp, struct fbcmap *palette) { @@ -2040,7 +2056,7 @@ } static int -bt463_load_cursor_palette(video_adapter_t *adp, struct bfcmap *palette) +bt463_load_cursor_palette(video_adapter_t *adp, struct fbcmap *palette) { struct gfb_softc *sc; int error, i; ==== //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.2 2001/11/08 01:49:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.3 2002/04/13 22:34:15 obrien Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,7 +70,9 @@ #include "opt_fb.h" +#if 0 static devclass_t gfb_devclass; +#endif #ifdef __alpha__ ==== //depot/projects/smpng/sys/dev/nge/if_nge.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $ + * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.28 2002/04/13 21:33:33 phk Exp $ */ /* @@ -132,7 +132,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $"; + "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.28 2002/04/13 21:33:33 phk Exp $"; #endif #define NGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) @@ -160,9 +160,6 @@ static int nge_encap (struct nge_softc *, struct mbuf *, u_int32_t *); static void nge_rxeof (struct nge_softc *); -#ifdef notdef -static void nge_rxeoc (struct nge_softc *); -#endif static void nge_txeof (struct nge_softc *); static void nge_intr (void *); static void nge_tick (void *); @@ -1348,20 +1345,6 @@ return; } -#ifdef notdef -void nge_rxeoc(sc) - struct nge_softc *sc; -{ - struct ifnet *ifp; - - ifp = &sc->arpcom.ac_if; - nge_rxeof(sc); - ifp->if_flags &= ~IFF_RUNNING; - nge_init(sc); - return; -} -#endif - /* * A frame was downloaded to the chip. It's safe for us to clean up * the list buffers. @@ -1496,12 +1479,14 @@ if ((status & NGE_ISR_RX_DESC_OK) || (status & NGE_ISR_RX_ERR) || (status & NGE_ISR_RX_OFLOW) || + (status & NGE_ISR_RX_FIFO_OFLOW) || + (status & NGE_ISR_RX_IDLE) || (status & NGE_ISR_RX_OK)) nge_rxeof(sc); -#ifdef notdef - if ((status & NGE_ISR_RX_OFLOW)) - nge_rxeoc(sc); -#endif + + if ((status & NGE_ISR_RX_IDLE)) + NGE_SETBIT(sc, NGE_CSR, NGE_CSR_RX_ENABLE); + if (status & NGE_ISR_SYSERR) { nge_reset(sc); ifp->if_flags &= ~IFF_RUNNING; ==== //depot/projects/smpng/sys/dev/nge/if_ngereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.5 2001/09/19 21:39:26 wpaul Exp $ + * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.6 2002/04/13 21:33:33 phk Exp $ */ #define NGE_CSR 0x00 @@ -226,7 +226,8 @@ #define NGE_INTRS \ (NGE_IMR_RX_OFLOW|NGE_IMR_TX_UFLOW|NGE_IMR_TX_OK|\ NGE_IMR_TX_IDLE|NGE_IMR_RX_OK|NGE_IMR_RX_ERR|\ - NGE_IMR_SYSERR|NGE_IMR_PHY_INTR) + NGE_IMR_SYSERR|NGE_IMR_PHY_INTR|\ + NGE_IMR_RX_IDLE|NGE_IMR_RX_FIFO_OFLOW) /* Interrupt enable register */ #define NGE_IER_INTRENB 0x00000001 ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#12 (text+ko) ==== @@ -25,7 +25,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.42 2002/04/04 21:03:15 jhb Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.43 2002/04/13 04:07:07 imp Exp $ + */ + +/* + * Copyright (c) 1998, 1999 and 2000 + * HAYAKAWA Koichi. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HAYAKAWA Koichi. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* ==== //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#5 (text+ko) ==== @@ -25,7 +25,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.9 2002/02/17 03:11:11 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.10 2002/04/13 04:07:07 imp Exp $ + */ + +/* + * Copyright (c) 1998, 1999 and 2000 + * HAYAKAWA Koichi. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HAYAKAWA Koichi. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* ==== //depot/projects/smpng/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.12 2002/02/26 03:31:35 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.13 2002/04/13 05:52:35 imp Exp $ */ /* @@ -345,7 +345,7 @@ case SYS_RES_MEMORY: if (!pcib_is_isa_mem(start)) { #ifndef PCI_ALLOW_UNSUPPORTED_IO_RANGE - if (start < sc->membase && end > sc->membase) + if (start < sc->membase && end >= sc->membase) start = sc->membase; if (end > sc->memlimit) end = sc->memlimit; ==== //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.15 2002/02/14 22:29:03 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.16 2002/04/13 22:34:16 obrien Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" @@ -256,7 +256,8 @@ video_adapter_t *adp; adp = scp->sc->adp; - if (scp->cursor_height <= 0) /* the text cursor is disabled */ + if (scp->curs_attr.height <= 0) + /* the text cursor is disabled */ return; if (on) { ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.382 2002/04/05 18:17:49 alfred Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.383 2002/04/13 22:34:16 obrien Exp $ */ #include "opt_syscons.h" @@ -2907,14 +2907,14 @@ scp->status |= GRAPHICS_MODE; scp->xpixel = info.vi_width; scp->ypixel = info.vi_height; - scp->xsize = info.vi_width/8; + scp->xsize = info.vi_width/info.vi_cwidth; scp->ysize = info.vi_height/info.vi_cheight; scp->font_size = 0; scp->font = NULL; } else { scp->xsize = info.vi_width; scp->ysize = info.vi_height; - scp->xpixel = scp->xsize*8; + scp->xpixel = scp->xsize*info.vi_cwidth; scp->ypixel = scp->ysize*info.vi_cheight; if (info.vi_cheight < 14) { scp->font_size = 8; ==== //depot/projects/smpng/sys/dev/syscons/syscons.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.73 2001/09/12 08:37:14 julian Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.74 2002/04/13 22:34:16 obrien Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ @@ -129,8 +129,15 @@ /* misc defines */ #define FALSE 0 #define TRUE 1 -#define COL 80 -#define ROW 25 + +/* + The following #defines are hard-coded for a maximum text + resolution corresponding to a maximum framebuffer + resolution of 1600x1200 with an 8x8 font... +*/ +#define COL 200 +#define ROW 150 + #define PCBURST 128 #ifndef BELL_DURATION ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#32 (text+ko) ==== @@ -71,6 +71,7 @@ #include <sys/socket.h> #include <sys/module.h> #include <sys/bus.h> +#include <sys/random.h> #include <sys/syslog.h> #include <sys/sysctl.h> @@ -95,16 +96,13 @@ #include <net/bpf.h> #include <dev/wi/if_wavelan_ieee.h> -#ifdef WI_HOSTAP #include <dev/wi/wi_hostap.h> -#include <sys/random.h> -#endif #include <dev/wi/if_wivar.h> #include <dev/wi/if_wireg.h> #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.96 2002/04/12 03:42:37 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.99 2002/04/12 06:12:21 imp Exp $"; #endif static void wi_intr(void *); @@ -315,10 +313,8 @@ wi_read_record(sc, &gen); sc->wi_has_wep = gen.wi_val; - if (bootverbose) { - device_printf(sc->dev, "%s:wi_has_wep = %d\n", - __func__, sc->wi_has_wep); - } + if (bootverbose) + device_printf(sc->dev, "wi_has_wep = %d\n", sc->wi_has_wep); /* * Find supported rates. @@ -351,7 +347,6 @@ ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_ADHOC, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); -#ifdef IFM_IEEE80211_HOSTAP if (sc->sc_firmware_type == WI_INTERSIL) { ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, IFM_IEEE80211_HOSTAP, 0), 0); @@ -364,7 +359,6 @@ ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_HOSTAP, 0), 0); } -#endif #undef ADD ifmedia_set(&sc->ifmedia, IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0)); @@ -613,7 +607,6 @@ eh = mtod(m, struct ether_header *); m->m_pkthdr.rcvif = ifp; -#ifdef WI_HOSTAP if (rx_frame.wi_status == WI_STAT_MGMT && sc->wi_ptype == WI_PORTTYPE_AP) { if ((WI_802_11_OFFSET_RAW + rx_frame.wi_dat_len + 2) > @@ -643,7 +636,6 @@ wihap_mgmt_input(sc, &rx_frame, m); return; } -#endif /* WI_HOSTAP */ if (rx_frame.wi_status == WI_STAT_1042 || rx_frame.wi_status == WI_STAT_TUNNEL || @@ -711,7 +703,6 @@ ifp->if_ipackets++; -#ifdef WI_HOSTAP if (sc->wi_ptype == WI_PORTTYPE_AP) { /* * Give host AP code first crack at data @@ -722,7 +713,6 @@ if (wihap_data_input(sc, &rx_frame, m)) return; } -#endif /* Receive packet. */ m_adj(m, sizeof(struct ether_header)); #ifdef WICACHE @@ -1123,14 +1113,12 @@ if (le16toh(ltv->wi_val)) { p2ltv.wi_val =htole16(PRIVACY_INVOKED | EXCLUDE_UNENCRYPTED); -#ifdef WI_HOSTAP if (sc->wi_ptype == WI_PORTTYPE_AP) /* * Disable tx encryption... * it's broken. */ p2ltv.wi_val |= htole16(HOST_ENCRYPT); -#endif } else p2ltv.wi_val = htole16(HOST_ENCRYPT | HOST_DECRYPT); @@ -1845,7 +1833,6 @@ wi_init(sc); break; -#ifdef WI_HOSTAP case SIOCHOSTAP_ADD: case SIOCHOSTAP_DEL: case SIOCHOSTAP_GET: @@ -1855,7 +1842,6 @@ /* Send all Host AP specific ioctl's to Host AP code. */ error = wihap_ioctl(sc, command, data); break; -#endif default: error = EINVAL; break; @@ -1986,15 +1972,8 @@ /* enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); -#ifdef WI_HOSTAP wihap_init(sc); - /* - * Initialize ICV to something random. XXX: this doesn't work - * if init happens in early boot-up. Fix later. - */ - read_random(&sc->wi_icv, sizeof(sc->wi_icv)); -#endif ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; @@ -2162,9 +2141,7 @@ return; } -#ifdef WI_HOSTAP nextpkt: -#endif IF_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) { WI_UNLOCK(sc); @@ -2176,7 +2153,6 @@ id = sc->wi_tx_data_id; eh = mtod(m0, struct ether_header *); >>> TRUNCATED FOR MAIL (1000 lines) <<< 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?200204140411.g3E4BUq73723>