frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bus error on startup in 64-bit Xephyr 

hostx_get_visual_masks takes unsigned long * arguments, but was being
passed pointers to CARD32's.
This commit is contained in:
Alan Coopersmith 2007-02-02 14:44:55 -08:00
parent 170a55022e
commit 5dcad9e9d7
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/kdrive/ephyr/ephyr.c
View File

@ -81,7 +81,8 @@ Bool
ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv) ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
{ {
int width = 640, height = 480; int width = 640, height = 480;
unsigned long redMask, greenMask, blueMask;
if (hostx_want_screen_size(&width, &height) if (hostx_want_screen_size(&width, &height)
|| !screen->width || !screen->height) || !screen->width || !screen->height)
{ {
@ -133,30 +134,24 @@ ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv)
{ {
screen->fb[0].depth = 15; screen->fb[0].depth = 15;
screen->fb[0].bitsPerPixel = 16; screen->fb[0].bitsPerPixel = 16;
hostx_get_visual_masks (&screen->fb[0].redMask,
&screen->fb[0].greenMask,
&screen->fb[0].blueMask);
} }
else if (screen->fb[0].depth <= 16) else if (screen->fb[0].depth <= 16)
{ {
screen->fb[0].depth = 16; screen->fb[0].depth = 16;
screen->fb[0].bitsPerPixel = 16; screen->fb[0].bitsPerPixel = 16;
hostx_get_visual_masks (&screen->fb[0].redMask,
&screen->fb[0].greenMask,
&screen->fb[0].blueMask);
} }
else else
{ {
screen->fb[0].depth = 24; screen->fb[0].depth = 24;
screen->fb[0].bitsPerPixel = 32; screen->fb[0].bitsPerPixel = 32;
hostx_get_visual_masks (&screen->fb[0].redMask,
&screen->fb[0].greenMask,
&screen->fb[0].blueMask);
} }
hostx_get_visual_masks (&redMask, &greenMask, &blueMask);
screen->fb[0].redMask = (Pixel) redMask;
screen->fb[0].greenMask = (Pixel) greenMask;
screen->fb[0].blueMask = (Pixel) blueMask;
} }
scrpriv->randr = screen->randr; scrpriv->randr = screen->randr;