Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The definition of bus_space_vaddr on i386 makes it inappropriate as the 

first argument to memset(), so change the code very slightly to workaround
that.
This commit is contained in:
cube 2007-01-13 19:45:28 +00:00
parent aaf0bffcea
commit 4096a1c345
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/ic/igsfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: igsfb.c,v 1.40 2006/08/18 02:42:38 uwe Exp $ */
/* $NetBSD: igsfb.c,v 1.41 2007/01/13 19:45:28 cube Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.40 2006/08/18 02:42:38 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.41 2007/01/13 19:45:28 cube Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -221,6 +221,7 @@ igsfb_init_video(struct igsfb_devconfig *dc)
bus_addr_t fbaddr, craddr;
off_t croffset;
uint8_t busctl, curctl;
void *va;
/* Total amount of video memory. */
busctl = igs_ext_read(dc->dc_iot, dc->dc_ioh, IGS_EXT_BUS_CTL);
@ -327,8 +328,8 @@ igsfb_init_video(struct igsfb_devconfig *dc)
/* XXX: fill dc_cursor and use igsfb_update_cursor() instead? */
memset(&dc->dc_cursor, 0, sizeof(struct igs_hwcursor));
memset(bus_space_vaddr(dc->dc_memt, dc->dc_crh),
/* transparent */ 0xaa, IGS_CURSOR_DATA_SIZE);
va = bus_space_vaddr(dc->dc_memt, dc->dc_crh);
memset(va, /* transparent */ 0xaa, IGS_CURSOR_DATA_SIZE);
curctl = igs_ext_read(dc->dc_iot, dc->dc_ioh, IGS_EXT_SPRITE_CTL);
curctl |= IGS_EXT_SPRITE_64x64;