diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-06-12 14:19:12 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-06-12 15:14:46 -0400 |
| commit | f807c82506f42c1e1fa63cfa56d7c79b653e46f8 (patch) | |
| tree | b6341edae4bbb6cf6a4e4fe727351480ba92c213 | |
| parent | 99d2cc8676a93ec21f5ca1cec3525a8dff8a6acd (diff) | |
| download | xorg-driver-xf86-video-vesa-f807c82506f42c1e1fa63cfa56d7c79b653e46f8.tar.gz | |
Clean up memory model checking, and properly refuse unsupported models.
| -rw-r--r-- | src/vesa.c | 30 |
1 files changed, 10 insertions, 20 deletions
@@ -764,17 +764,8 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) mode = ((VbeModeInfoData*)pScrn->modes->Private)->data; switch (mode->MemoryModel) { - case 0x0: /* Text mode */ - case 0x1: /* CGA graphics */ - case 0x2: /* Hercules graphics */ - case 0x3: /* Planar */ - case 0x5: /* Non-chain 4, 256 color */ - case 0x7: /* YUV */ - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unsupported Memory Model: %d", mode->MemoryModel); - break; case 0x4: /* Packed pixel */ - case 0x6: /* Direct Color */ + case 0x6: /* Direct Color */ pScrn->bitmapBitOrder = BITMAP_BIT_ORDER; switch (pScrn->bitsPerPixel) { @@ -790,6 +781,10 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } break; + default: + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unsupported Memory Model: %d", mode->MemoryModel); + return FALSE; } if (pVesa->shadowFB) { @@ -925,17 +920,8 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) mode = ((VbeModeInfoData*)pScrn->modes->Private)->data; switch (mode->MemoryModel) { - case 0x0: /* Text mode */ - case 0x1: /* CGA graphics */ - case 0x2: /* Hercules graphics */ - case 0x3: /* Planar */ - case 0x5: /* Non-chain 4, 256 color */ - case 0x7: /* YUV */ - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Unsupported Memory Model: %d", mode->MemoryModel); - return (FALSE); case 0x4: /* Packed pixel */ - case 0x6: /* Direct Color */ + case 0x6: /* Direct Color */ switch (pScrn->bitsPerPixel) { case 8: case 16: @@ -955,6 +941,10 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return (FALSE); } break; + default: + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unsupported Memory Model: %d", mode->MemoryModel); + return (FALSE); } |