xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devvga: use uintptr for VGAscr.paddr and VGAscr.storage

Browse source 
some vga drivers use virtual addresses in VGAscr.storage,
so has to be uintptr sized for amd64.
This commit is contained in:
cinap_lenrek 2015-01-16 11:36:11 +01:00
parent 6afce2e422
commit 5e50b13d34
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/pc/devvga.c
View file

@ -217,7 +217,7 @@ vgaread(Chan* c, void* a, long n, vlong off)
len += snprint(p+len, READSTR-len, "hwaccel %s\n", hwaccel ? "on" : "off"); len += snprint(p+len, READSTR-len, "hwaccel %s\n", hwaccel ? "on" : "off");
len += snprint(p+len, READSTR-len, "hwblank %s\n", hwblank ? "on" : "off"); len += snprint(p+len, READSTR-len, "hwblank %s\n", hwblank ? "on" : "off");
len += snprint(p+len, READSTR-len, "panning %s\n", panning ? "on" : "off"); len += snprint(p+len, READSTR-len, "panning %s\n", panning ? "on" : "off");
len += snprint(p+len, READSTR-len, "addr p 0x%lux v 0x%p size 0x%ux\n", scr->paddr, scr->vaddr, scr->apsize); len += snprint(p+len, READSTR-len, "addr p %#p v %#p size %#ux\n", scr->paddr, scr->vaddr, scr->apsize);
len += snprint(p+len, READSTR-len, "softscreen %s\n", scr->softscreen ? "on" : "off"); len += snprint(p+len, READSTR-len, "softscreen %s\n", scr->softscreen ? "on" : "off");
USED(len); USED(len);

14
sys/src/9/pc/screen.h
View file

@ -95,16 +95,16 @@ struct VGAscr {
Pcidev* pci; Pcidev* pci;
VGAcur* cur; VGAcur* cur;
ulong storage; uintptr storage;
Cursor; Cursor;
int useflush; int useflush;
ulong paddr; /* frame buffer */ uintptr paddr; /* frame buffer */
void* vaddr; void* vaddr;
int apsize; int apsize;
ulong io; /* device specific registers */ ulong io; /* device specific registers */
ulong *mmio; ulong *mmio;
ulong colormap[Pcolours][3]; ulong colormap[Pcolours][3];
@ -118,9 +118,9 @@ struct VGAscr {
int (*scroll)(VGAscr*, Rectangle, Rectangle); int (*scroll)(VGAscr*, Rectangle, Rectangle);
void (*blank)(VGAscr*, int); void (*blank)(VGAscr*, int);
ulong id; /* internal identifier for driver use */ ulong id; /* internal identifier for driver use */
int isblank; int isblank;
int overlayinit; int overlayinit;
int softscreen; int softscreen;
}; };
extern VGAscr vgascreen[]; extern VGAscr vgascreen[];