X Strike Force XFree86 SVN commit: r2058 - in trunk/debian: . patches
Author: branden
Date: 2004-12-09 15:36:18 -0500 (Thu, 09 Dec 2004)
New Revision: 2058
Added:
trunk/debian/patches/099n_fbdev_driver_message_improvements.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
Tidy up and improve fbdev driver messages, correcting spelling, adding
information, and otherwise enhancing them. (Closes: #275318)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-12-09 20:17:04 UTC (rev 2057)
+++ trunk/debian/CHANGESETS 2004-12-09 20:36:18 UTC (rev 2058)
@@ -386,4 +386,8 @@
Teemu Ikonen. (Closes: #261993)
2055, 2056
+Tidy up and improve fbdev driver messages, correcting spelling, adding
+information, and otherwise enhancing them. (Closes: #275318)
+ 2058
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-12-09 20:17:04 UTC (rev 2057)
+++ trunk/debian/changelog 2004-12-09 20:36:18 UTC (rev 2058)
@@ -248,6 +248,9 @@
* Increase the minimum pixel clock for Matrox cards based on feedback from
Teemu Ikonen. (Closes: #261993)
+ * Tidy up and improve fbdev driver messages, correcting spelling, adding
+ information, and otherwise enhancing them. (Closes: #275318)
+
Changes by Denis Barbier and Fabio M. Di Nitto:
* Edit xc/programs/xkbcomp/symbols/pc/Imakefile so that the new pc/us_intl
@@ -339,7 +342,7 @@
Thomas Beige. Resolves CAN-2004-0914: memory leak, improper use of signed
integers, and overflows in the Xpm library. Resync offset in patch #200.
- -- Branden Robinson <branden@debian.org> Thu, 9 Dec 2004 13:07:05 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 9 Dec 2004 15:35:19 -0500
xfree86 (4.3.0.dfsg.1-8) unstable; urgency=high
Added: trunk/debian/patches/099n_fbdev_driver_message_improvements.diff
===================================================================
--- trunk/debian/patches/099n_fbdev_driver_message_improvements.diff 2004-12-09 20:17:04 UTC (rev 2057)
+++ trunk/debian/patches/099n_fbdev_driver_message_improvements.diff 2004-12-09 20:36:18 UTC (rev 2058)
@@ -0,0 +1,345 @@
+$Id$
+
+Tidy up and improve fbdev driver messages, correcting spelling, adding
+information, and otherwise enhancing them.
+
+Fixes a spelling error (see Debian #275318).
+
+This patch by Branden Robinson.
+
+Not submitted upstream to XFree86.
+
+--- xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c~ 2004-12-09 13:32:36.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c 2004-12-09 14:35:19.000000000 -0500
+@@ -432,7 +432,7 @@
+
+ /* We don't currently support DirectColor at > 8bpp */
+ if (pScrn->depth > 8 && pScrn->defaultVisual != TrueColor) {
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Given default visual"
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "requested default visual"
+ " (%s) is not supported at depth %d\n",
+ xf86GetVisualName(pScrn->defaultVisual), pScrn->depth);
+ return FALSE;
+@@ -451,8 +451,8 @@
+ pScrn->chipset = "fbdev";
+ pScrn->videoRam = fbdevHWGetVidmem(pScrn);
+
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Hardware: %s (vidmem: %dk)\n",
+- fbdevHWGetName(pScrn),pScrn->videoRam/1024);
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "hardware: %s (video memory:"
++ " %dkB)\n", fbdevHWGetName(pScrn), pScrn->videoRam/1024);
+
+ /* handle options */
+ xf86CollectOptions(pScrn, NULL);
+@@ -473,37 +473,37 @@
+ fPtr->shadowFB = TRUE;
+ fPtr->rotate = FBDEV_ROTATE_CW;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Rotating screen clockwise\n");
++ "rotating screen clockwise\n");
+ }
+ else if(!xf86NameCmp(s, "CCW"))
+ {
+ fPtr->shadowFB = TRUE;
+ fPtr->rotate = FBDEV_ROTATE_CCW;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Rotating screen counter clockwise\n");
++ "rotating screen counter-clockwise\n");
+ }
+ else if(!xf86NameCmp(s, "UD"))
+ {
+ fPtr->shadowFB = TRUE;
+ fPtr->rotate = FBDEV_ROTATE_UD;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Rotating screen upside down\n");
++ "rotating screen upside-down\n");
+ }
+ else
+ {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "\"%s\" is not a valid value for Option \"Rotate\"\n", s);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+- "Valid options are \"CW\", \"CCW\" or \"UD\"\n");
++ "valid options are \"CW\", \"CCW\" and \"UD\"\n");
+ }
+ }
+
+ /* select video modes */
+
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Checking Modes against framebuffer device...\n");
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against framebuffer device...\n");
+ fbdevHWSetVideoModes(pScrn);
+
+- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Checking Modes against monitor...\n");
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "checking modes against monitor...\n");
+ {
+ DisplayModePtr mode, first = mode = pScrn->modes;
+
+@@ -553,31 +553,35 @@
+ break;
+ default:
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "Unsupported bpp: %d", pScrn->bitsPerPixel);
++ "unsupported number of bits per pixel: %d\n",
++ pScrn->bitsPerPixel);
+ return FALSE;
+ }
+ break;
+ case FBDEVHW_INTERLEAVED_PLANES:
+- /* Not supported yet, don't know what to do with this */
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "Interleaved Planes are not supported yet by drivers/fbdev.");
++ /* Not supported yet, don't know what to do with this */
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++ "interleaved planes are not yet supported by the"
++ " fbdev driver [1]\n");
+ return FALSE;
+ case FBDEVHW_TEXT:
+- /* This should never happen ...
+- * we should check for this much much earlier ... */
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "Text mode is not supprted by drivers/fbdev.\n"
+- "Why do you want to run the X in TEXT mode anyway ?");
++ /* This should never happen ...
++ * we should check for this much much earlier ... */
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++ "text mode is not supported by the fbdev driver"
++ " [1]\n");
+ return FALSE;
+ case FBDEVHW_VGA_PLANES:
+- /* Not supported yet */
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "EGA/VGA Planes are not supprted yet by drivers/fbdev.");
+- return FALSE;
++ /* Not supported yet */
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++ "EGA/VGA planes are not yet supported by the fbdev"
++ " driver [1]\n");
++ return FALSE;
+ default:
+- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+- "Fbdev type (%d) not supported yet.");
+- return FALSE;
++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++ "unrecognized fbdev hardware type (%d) [1]\n",
++ fbdevHWGetType(pScrn));
++ return FALSE;
+ }
+ if (mod && xf86LoadSubModule(pScrn, mod) == NULL) {
+ FBDevFreeRec(pScrn);
+@@ -589,7 +593,8 @@
+
+ /* Load shadow if needed */
+ if (fPtr->shadowFB) {
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using \"Shadow Framebuffer\"\n");
++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "using shadow"
++ " framebuffer\n");
+ if (!xf86LoadSubModule(pScrn, "shadow")) {
+ FBDevFreeRec(pScrn);
+ return FALSE;
+@@ -623,7 +628,8 @@
+ #endif
+
+ if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) {
+- xf86DrvMsg(scrnIndex,X_ERROR,"Map vid mem failed\n");
++ xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
++ " failed\n");
+ return FALSE;
+ }
+ fPtr->fboff = fbdevHWLinearOffset(pScrn);
+@@ -631,7 +637,7 @@
+ fbdevHWSave(pScrn);
+
+ if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) {
+- xf86DrvMsg(scrnIndex,X_ERROR,"Mode init failed\n");
++ xf86DrvMsg(scrnIndex,X_ERROR,"mode initialization failed\n");
+ return FALSE;
+ }
+ fbdevHWSaveScreen(pScreen, SCREEN_SAVER_ON);
+@@ -641,19 +647,23 @@
+ miClearVisualTypes();
+ if (pScrn->bitsPerPixel > 8) {
+ if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
+- xf86DrvMsg(scrnIndex,X_ERROR,"Set visual types failed\n");
++ xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
++ " for %d bits per pixel [1]\n",
++ pScrn->bitsPerPixel);
+ return FALSE;
+ }
+ } else {
+ if (!miSetVisualTypes(pScrn->depth,
+ miGetDefaultVisualMask(pScrn->depth),
+ pScrn->rgbBits, pScrn->defaultVisual)) {
+- xf86DrvMsg(scrnIndex,X_ERROR,"Set visual types failed\n");
++ xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed"
++ " for %d bits per pixel [2]\n",
++ pScrn->bitsPerPixel);
+ return FALSE;
+ }
+ }
+ if (!miSetPixmapDepths()) {
+- xf86DrvMsg(scrnIndex,X_ERROR,"Set pixmap depths failed\n");
++ xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n");
+ return FALSE;
+ }
+
+@@ -676,7 +686,7 @@
+ if ((fPtr->shadowmem = shadowAlloc(width, height,
+ pScrn->bitsPerPixel)) == NULL) {
+ xf86DrvMsg(scrnIndex,X_ERROR,
+- "Allocation of shadow memory failed\n");
++ "allocation of shadow framebuffer memory failed\n");
+ return FALSE;
+ }
+
+@@ -693,14 +703,15 @@
+ if (fPtr->rotate)
+ {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: Rotate not supported for afb\n");
++ "internal error: rotate not supported for afb\n");
+ ret = FALSE;
+ break;
+ }
+ if (fPtr->shadowFB)
+ {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: Shadow framebuffer not supported for afb\n");
++ "internal error: shadow framebuffer not supported"
++ " for afb\n");
+ ret = FALSE;
+ break;
+ }
+@@ -721,8 +732,9 @@
+ break;
+ default:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: invalid bpp (%d) in FBDevScreenInit\n",
+- pScrn->bitsPerPixel);
++ "internal error: invalid number of bits per"
++ " pixel (%d) encountered in"
++ " FBDevScreenInit()\n", pScrn->bitsPerPixel);
+ ret = FALSE;
+ break;
+ }
+@@ -731,29 +743,30 @@
+ /* This should never happen ...
+ * we should check for this much much earlier ... */
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: Text mode is not supprted by drivers/fbdev.\n"
+- "Comment: Why do you want to run the X in TEXT mode anyway ?");
++ "internal error: interleaved planes are not"
++ " supported by the fbdev driver [1]\n");
+ ret = FALSE;
+ break;
+ case FBDEVHW_TEXT:
+ /* This should never happen ...
+ * we should check for this much much earlier ... */
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: Text mode is not supprted by drivers/fbdev.\n"
+- "Comment: Why do you want to run the X in TEXT mode anyway ?");
++ "internal error: text mode is not supported by the"
++ " fbdev driver [1]\n");
+ ret = FALSE;
+ break;
+ case FBDEVHW_VGA_PLANES:
+ /* Not supported yet */
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: EGA/VGA Planes are not supprted"
+- " yet by drivers/fbdev.");
++ "internal error: EGA/VGA planes are not supported by"
++ " the fbdev driver [1]\n");
+ ret = FALSE;
+ break;
+ default:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: fbdev type (%d) unsupported in"
+- " FBDevScreenInit\n");
++ "internal error: unrecognized fbdev hardware type"
++ " (%d) encountered in FBDevScreenInit() [1]\n",
++ fbdevHWGetType(pScrn));
+ ret = FALSE;
+ break;
+ }
+@@ -778,24 +791,25 @@
+ /* must be after RGB ordering fixed */
+ if (init_picture && !fbPictureInit(pScreen, NULL, 0))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- "RENDER extension initialisation failed.\n");
++ "RENDER extension initialisation failed\n");
+
+ if (fPtr->shadowFB &&
+ (!shadowSetup(pScreen) || !shadowAdd(pScreen, NULL,
+ fPtr->rotate ? shadowUpdateRotatePacked : shadowUpdatePacked,
+ FBDevWindowLinear, fPtr->rotate, NULL)) ) {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Shadow framebuffer initialization failed.\n");
++ "shadow framebuffer initialization failed\n");
+ return FALSE;
+ }
+
+ if (!fPtr->rotate)
+ FBDevDGAInit(pScrn, pScreen);
+ else {
+- xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, disabling DGA\n");
++ xf86DrvMsg(scrnIndex, X_INFO, "display rotated; disabling DGA\n");
+
+ if (pScrn->bitsPerPixel == 24)
+- xf86DrvMsg(scrnIndex, X_WARNING, "Rotation might be broken in 24 bpp\n");
++ xf86DrvMsg(scrnIndex, X_WARNING, "rotation might be broken at 24"
++ " bits per pixel\n");
+ }
+
+ xf86SetBlackWhitePixels(pScreen);
+@@ -811,32 +825,42 @@
+ /* XXX It would be simpler to use miCreateDefColormap() in all cases. */
+ #ifdef USE_AFB
+ case FBDEVHW_PLANES:
+- if (!afbCreateDefColormap(pScreen))
++ if (!afbCreateDefColormap(pScreen)) {
++ xf86DrvMsg(scrnIndex, X_ERROR,
++ "internal error: afbCreateDefColormap()"
++ " failed in FBDevScreenInit()\n");
+ return FALSE;
++ }
+ break;
+ #endif
+ case FBDEVHW_PACKED_PIXELS:
+- if (!miCreateDefColormap(pScreen))
++ if (!miCreateDefColormap(pScreen)) {
++ xf86DrvMsg(scrnIndex, X_ERROR,
++ "internal error: miCreateDefColormap()"
++ " failed in FBDevScreenInit()\n");
+ return FALSE;
++ }
+ break;
+ case FBDEVHW_INTERLEAVED_PLANES:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: invalid fbdev type (interleaved planes)"
+- " in FBDevScreenInit\n");
++ "internal error: interleaved planes are not"
++ " supported by the fbdev driver [2]\n");
+ return FALSE;
+ case FBDEVHW_TEXT:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: invalid fbdev type (text)"
+- " in FBDevScreenInit\n");
++ "internal error: text mode is not supported by the"
++ " fbdev driver [2]\n");
+ return FALSE;
+ case FBDEVHW_VGA_PLANES:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: invalid fbdev type (ega/vga planes)"
+- " in FBDevScreenInit\n");
++ "internal error: EGA/VGA planes are not supported by"
++ " the fbdev driver [2]\n");
+ return FALSE;
+ default:
+ xf86DrvMsg(scrnIndex, X_ERROR,
+- "Internal error: invalid fbdev type (%d) in FBDevScreenInit\n");
++ "internal error: unrecognized fbdev hardware type"
++ " (%d) encountered in FBDevScreenInit() [2]\n",
++ fbdevHWGetType(pScrn));
+ return FALSE;
+ }
+ flags = CMAP_PALETTED_TRUECOLOR;
Property changes on: trunk/debian/patches/099n_fbdev_driver_message_improvements.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: