devvga: use uintptr for VGAscr.paddr and VGAscr.storage
some vga drivers use virtual addresses in VGAscr.storage, so has to be uintptr sized for amd64.
This commit is contained in:
parent
6afce2e422
commit
5e50b13d34
|
@ -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, "hwblank %s\n", hwblank ? "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");
|
||||
USED(len);
|
||||
|
||||
|
|
|
@ -95,16 +95,16 @@ struct VGAscr {
|
|||
Pcidev* pci;
|
||||
|
||||
VGAcur* cur;
|
||||
ulong storage;
|
||||
uintptr storage;
|
||||
Cursor;
|
||||
|
||||
int useflush;
|
||||
|
||||
ulong paddr; /* frame buffer */
|
||||
uintptr paddr; /* frame buffer */
|
||||
void* vaddr;
|
||||
int apsize;
|
||||
int apsize;
|
||||
|
||||
ulong io; /* device specific registers */
|
||||
ulong io; /* device specific registers */
|
||||
ulong *mmio;
|
||||
|
||||
ulong colormap[Pcolours][3];
|
||||
|
@ -118,9 +118,9 @@ struct VGAscr {
|
|||
int (*scroll)(VGAscr*, Rectangle, Rectangle);
|
||||
void (*blank)(VGAscr*, int);
|
||||
ulong id; /* internal identifier for driver use */
|
||||
int isblank;
|
||||
int overlayinit;
|
||||
int softscreen;
|
||||
int isblank;
|
||||
int overlayinit;
|
||||
int softscreen;
|
||||
};
|
||||
|
||||
extern VGAscr vgascreen[];
|
||||
|
|
Loading…
Reference in a new issue