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

Merge branch 'revert-xf86Msg' into 'master' 

Revert !1681 ("(trivial) xfree86: use LogMessageVerb() instead of xf86MsgVerb()")

See merge request xorg/xserver!2021
This commit is contained in:
Marge Bot 2025-06-17 20:49:44 +00:00
parent 81b14fb1a6 d7e741665b
commit e610fa3234
37 changed files with 509 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glx/vndext.c
View File

@ -198,7 +198,7 @@ GLXClientCallback(CallbackListPtr *list, void *closure, void *data)
static void static void
GLXReset(ExtensionEntry *extEntry) GLXReset(ExtensionEntry *extEntry)
{ {
// LogMessageVerb(X_INFO, 1, "GLX: GLXReset\n"); // xf86Msg(X_INFO, "GLX: GLXReset\n");
GlxVendorExtensionReset(extEntry); GlxVendorExtensionReset(extEntry);
GlxDispatchReset(); GlxDispatchReset();

10
hw/xfree86/common/xf86.h
View File

@ -248,6 +248,12 @@ extern _X_EXPORT void
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
_X_ATTRIBUTE_PRINTF(3, 4); _X_ATTRIBUTE_PRINTF(3, 4);
extern _X_EXPORT void extern _X_EXPORT void
xf86MsgVerb(MessageType type, int verb, const char *format, ...)
_X_ATTRIBUTE_PRINTF(3, 4);
extern _X_EXPORT void
xf86Msg(MessageType type, const char *format, ...)
_X_ATTRIBUTE_PRINTF(2, 3);
extern _X_EXPORT void
xf86ErrorFVerb(int verb, const char *format, ...) xf86ErrorFVerb(int verb, const char *format, ...)
_X_ATTRIBUTE_PRINTF(2, 3); _X_ATTRIBUTE_PRINTF(2, 3);
extern _X_EXPORT void extern _X_EXPORT void
@ -394,8 +400,4 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
extern _X_EXPORT void extern _X_EXPORT void
xf86UpdateDesktopDimensions(void); xf86UpdateDesktopDimensions(void);
/* only for backwards (source) compatibility */
#define xf86MsgVerb LogMessageVerb
#define xf86Msg(type, ...) LogMessageVerb(type, 1, __VA_ARGS__)
#endif /* _XF86_H */ #endif /* _XF86_H */

24
hw/xfree86/common/xf86AutoConfig.c
View File

@ -160,7 +160,7 @@ xf86AddMatchedDriver(XF86MatchedDrivers *md, const char *driver)
md->nmatches++; md->nmatches++;
} }
else { else {
LogMessageVerb(X_WARNING, 1, "Too many drivers registered, can't add %s\n", driver); xf86Msg(X_WARNING, "Too many drivers registered, can't add %s\n", driver);
} }
} }
@ -178,7 +178,7 @@ xf86AutoConfig(void)
ret = CONFIG_OK; /* OK so far */ ret = CONFIG_OK; /* OK so far */
} }
else { else {
LogMessageVerb(X_ERROR, 1, "Couldn't allocate Config record.\n"); xf86Msg(X_ERROR, "Couldn't allocate Config record.\n");
return FALSE; return FALSE;
} }
@ -205,14 +205,14 @@ xf86AutoConfig(void)
free(md.matches[i]); free(md.matches[i]);
} }
LogMessageVerb(X_DEFAULT, 0, xf86MsgVerb(X_DEFAULT, 0,
"Using default built-in configuration (%d lines)\n", "Using default built-in configuration (%d lines)\n",
builtinLines); builtinLines);
LogMessageVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n"); xf86MsgVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n");
for (cp = builtinConfig; *cp; cp++) for (cp = builtinConfig; *cp; cp++)
xf86ErrorFVerb(3, "\t%s", *cp); xf86ErrorFVerb(3, "\t%s", *cp);
LogMessageVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n"); xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n");
xf86initConfigFiles(); xf86initConfigFiles();
xf86setBuiltinConfig(builtinConfig); xf86setBuiltinConfig(builtinConfig);
@ -220,7 +220,7 @@ xf86AutoConfig(void)
FreeConfig(); FreeConfig();
if (ret != CONFIG_OK) if (ret != CONFIG_OK)
LogMessageVerb(X_ERROR, 1, "Error parsing the built-in default configuration.\n"); xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n");
return ret == CONFIG_OK; return ret == CONFIG_OK;
} }
@ -253,12 +253,12 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
} }
if (iret < 0) { if (iret < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"could not get frame buffer identifier from %s\n", "could not get frame buffer identifier from %s\n",
xf86SolarisFbDev); xf86SolarisFbDev);
} }
else { else {
LogMessageVerb(X_PROBED, 1, "console driver: %s\n", visid.name); xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
/* Special case from before the general case was set */ /* Special case from before the general case was set */
if (strcmp(visid.name, "NVDAnvda") == 0) { if (strcmp(visid.name, "NVDAnvda") == 0) {
@ -392,7 +392,7 @@ autoConfigDevice(GDevPtr preconf_device)
/* get all possible video drivers and count them */ /* get all possible video drivers and count them */
listPossibleVideoDrivers(&md); listPossibleVideoDrivers(&md);
for (i = 0; i < md.nmatches; i++) { for (i = 0; i < md.nmatches; i++) {
LogMessageVerb(X_DEFAULT, 1, "Matched %s as autoconfigured driver %d\n", xf86Msg(X_DEFAULT, "Matched %s as autoconfigured driver %d\n",
md.matches[i], i); md.matches[i], i);
} }
@ -441,7 +441,7 @@ autoConfigDevice(GDevPtr preconf_device)
} }
} }
LogMessageVerb(X_DEFAULT, 1, "Assigned the driver to the xf86ConfigLayout\n"); xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n");
return ptr; return ptr;
} }

14
hw/xfree86/common/xf86Bus.c
View File

@ -99,7 +99,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
} }
#endif #endif
if (!foundScreen && (drv->Probe != NULL)) { if (!foundScreen && (drv->Probe != NULL)) {
LogMessageVerb(X_WARNING, 1, "Falling back to old probe method for %s\n", xf86Msg(X_WARNING, "Falling back to old probe method for %s\n",
drv->driverName); drv->driverName);
foundScreen = (*drv->Probe) (drv, (detect_only) ? PROBE_DETECT foundScreen = (*drv->Probe) (drv, (detect_only) ? PROBE_DETECT
: PROBE_DEFAULT); : PROBE_DEFAULT);
@ -184,7 +184,7 @@ xf86BusConfig(void)
/* If nothing was detected, return now */ /* If nothing was detected, return now */
if (xf86NumScreens == 0) { if (xf86NumScreens == 0) {
LogMessageVerb(X_ERROR, 1, "No devices detected.\n"); xf86Msg(X_ERROR, "No devices detected.\n");
return FALSE; return FALSE;
} }
@ -208,9 +208,9 @@ xf86BusConfig(void)
xf86Screens[i]->confScreen = layout->screen; xf86Screens[i]->confScreen = layout->screen;
else { else {
/* No match found */ /* No match found */
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Screen %d deleted because of no matching config section.\n", "Screen %d deleted because of no matching config section.\n",
i); i);
xf86DeleteScreen(xf86Screens[i--]); xf86DeleteScreen(xf86Screens[i--]);
} }
} }
@ -224,8 +224,8 @@ xf86BusConfig(void)
/* If no screens left, return now. */ /* If no screens left, return now. */
if (xf86NumScreens == 0) { if (xf86NumScreens == 0) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Device(s) detected, but none match those in the config file.\n"); "Device(s) detected, but none match those in the config file.\n");
return FALSE; return FALSE;
} }

210
hw/xfree86/common/xf86Config.c
View File

@ -196,8 +196,8 @@ xf86ValidateFontPath(char *path)
if (!S_ISDIR(stat_buf.st_mode)) if (!S_ISDIR(stat_buf.st_mode))
flag = -1; flag = -1;
if (flag != 0) { if (flag != 0) {
LogMessageVerb(X_WARNING, 1, "The directory \"%s\" does not exist.\n", xf86Msg(X_WARNING, "The directory \"%s\" does not exist.\n",
dir_elem); dir_elem);
xf86ErrorF("\tEntry deleted from font path.\n"); xf86ErrorF("\tEntry deleted from font path.\n");
free(dir_elem); free(dir_elem);
continue; continue;
@ -210,9 +210,9 @@ xf86ValidateFontPath(char *path)
flag = -1; flag = -1;
free(p1); free(p1);
if (flag != 0) { if (flag != 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"`fonts.dir' not found (or not valid) in \"%s\".\n", "`fonts.dir' not found (or not valid) in \"%s\".\n",
dir_elem); dir_elem);
xf86ErrorF("\tEntry deleted from font path.\n"); xf86ErrorF("\tEntry deleted from font path.\n");
xf86ErrorF("\t(Run 'mkfontdir' on \"%s\").\n", dir_elem); xf86ErrorF("\t(Run 'mkfontdir' on \"%s\").\n", dir_elem);
free(dir_elem); free(dir_elem);
@ -270,7 +270,7 @@ xf86ModulelistFromConfig(void ***optlist)
* ModulePath * ModulePath
*/ */
if (xf86configptr == NULL) { if (xf86configptr == NULL) {
LogMessageVerb(X_ERROR, 1, "Cannot access global config data structure\n"); xf86Msg(X_ERROR, "Cannot access global config data structure\n");
return NULL; return NULL;
} }
@ -280,9 +280,9 @@ xf86ModulelistFromConfig(void ***optlist)
*/ */
modp = xf86configptr->conf_modules->mod_disable_lst; modp = xf86configptr->conf_modules->mod_disable_lst;
while (modp) { while (modp) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n", "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n",
modp->load_name); modp->load_name);
modp = (XF86LoadPtr) modp->list.next; modp = (XF86LoadPtr) modp->list.next;
} }
/* /*
@ -293,18 +293,18 @@ xf86ModulelistFromConfig(void ***optlist)
*/ */
for (i = 0; ModuleDefaults[i].name != NULL; i++) { for (i = 0; ModuleDefaults[i].name != NULL; i++) {
if (ModuleDefaults[i].toLoad == FALSE) { if (ModuleDefaults[i].toLoad == FALSE) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"\"%s\" is not to be loaded by default. Skipping.\n", "\"%s\" is not to be loaded by default. Skipping.\n",
ModuleDefaults[i].name); ModuleDefaults[i].name);
continue; continue;
} }
found = FALSE; found = FALSE;
modp = xf86configptr->conf_modules->mod_load_lst; modp = xf86configptr->conf_modules->mod_load_lst;
while (modp) { while (modp) {
if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) { if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
LogMessageVerb(X_INFO, 1, xf86Msg(X_INFO,
"\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n", "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n",
ModuleDefaults[i].name); ModuleDefaults[i].name);
found = TRUE; found = TRUE;
break; break;
} }
@ -314,9 +314,9 @@ xf86ModulelistFromConfig(void ***optlist)
modp = xf86configptr->conf_modules->mod_disable_lst; modp = xf86configptr->conf_modules->mod_disable_lst;
while (modp) { while (modp) {
if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) { if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
LogMessageVerb(X_INFO, 1, xf86Msg(X_INFO,
"\"%s\" will be loaded even though the default is to disable it.\n", "\"%s\" will be loaded even though the default is to disable it.\n",
ModuleDefaults[i].name); ModuleDefaults[i].name);
found = TRUE; found = TRUE;
break; break;
} }
@ -329,8 +329,8 @@ xf86ModulelistFromConfig(void ***optlist)
xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, xf86addNewLoadDirective(ptr, ModuleDefaults[i].name,
XF86_LOAD_MODULE, XF86_LOAD_MODULE,
ModuleDefaults[i].load_opt); ModuleDefaults[i].load_opt);
LogMessageVerb(X_INFO, 1, "\"%s\" will be loaded by default.\n", xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n",
ModuleDefaults[i].name); ModuleDefaults[i].name);
} }
} }
} }
@ -402,7 +402,7 @@ xf86DriverlistFromConfig(void)
* ModulePath * ModulePath
*/ */
if (xf86configptr == NULL) { if (xf86configptr == NULL) {
LogMessageVerb(X_ERROR, 1, "Cannot access global config data structure\n"); xf86Msg(X_ERROR, "Cannot access global config data structure\n");
return NULL; return NULL;
} }
@ -479,7 +479,7 @@ xf86InputDriverlistFromConfig(void)
* ModulePath * ModulePath
*/ */
if (xf86configptr == NULL) { if (xf86configptr == NULL) {
LogMessageVerb(X_ERROR, 1, "Cannot access global config data structure\n"); xf86Msg(X_ERROR, "Cannot access global config data structure\n");
return NULL; return NULL;
} }
@ -583,7 +583,7 @@ configFiles(XF86ConfFilesPtr fileconf)
/* copy last entry */ /* copy last entry */
*(temp_path++) = '\t'; *(temp_path++) = '\t';
strcpy(temp_path, start); strcpy(temp_path, start);
LogMessageVerb(pathFrom, 1, "FontPath set to:\n%s\n", log_buf); xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
free(log_buf); free(log_buf);
/* ModulePath */ /* ModulePath */
@ -595,12 +595,12 @@ configFiles(XF86ConfFilesPtr fileconf)
} }
} }
LogMessageVerb(xf86ModPathFrom, 1, "ModulePath set to \"%s\"\n", xf86ModulePath); xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
if (!xf86xkbdirFlag && fileconf && fileconf->file_xkbdir) { if (!xf86xkbdirFlag && fileconf && fileconf->file_xkbdir) {
XkbBaseDirectory = fileconf->file_xkbdir; XkbBaseDirectory = fileconf->file_xkbdir;
LogMessageVerb(X_CONFIG, 1, "XKB base directory set to \"%s\"\n", xf86Msg(X_CONFIG, "XKB base directory set to \"%s\"\n",
XkbBaseDirectory); XkbBaseDirectory);
} }
#if 0 #if 0
/* LogFile */ /* LogFile */
@ -750,12 +750,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
if (xf86Info.ignoreABI) { if (xf86Info.ignoreABI) {
LogMessageVerb(X_CONFIG, 1, "Ignoring ABI Version\n"); xf86Msg(X_CONFIG, "Ignoring ABI Version\n");
} }
xf86GetOptValBool(FlagOptions, FLAG_ALLOW_BYTE_SWAPPED_CLIENTS, &AllowByteSwappedClients); xf86GetOptValBool(FlagOptions, FLAG_ALLOW_BYTE_SWAPPED_CLIENTS, &AllowByteSwappedClients);
if (AllowByteSwappedClients) { if (AllowByteSwappedClients) {
LogMessageVerb(X_CONFIG, 1, "Allowing byte-swapped clients\n"); xf86Msg(X_CONFIG, "Allowing byte-swapped clients\n");
} }
if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_DEVICES)) { if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_DEVICES)) {
@ -766,8 +766,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else { else {
from = X_DEFAULT; from = X_DEFAULT;
} }
LogMessageVerb(from, 1, "%sutomatically adding devices\n", xf86Msg(from, "%sutomatically adding devices\n",
xf86Info.autoAddDevices ? "A" : "Not a"); xf86Info.autoAddDevices ? "A" : "Not a");
if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ENABLE_DEVICES)) { if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ENABLE_DEVICES)) {
xf86GetOptValBool(FlagOptions, FLAG_AUTO_ENABLE_DEVICES, xf86GetOptValBool(FlagOptions, FLAG_AUTO_ENABLE_DEVICES,
@ -777,8 +777,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else { else {
from = X_DEFAULT; from = X_DEFAULT;
} }
LogMessageVerb(from, 1, "%sutomatically enabling devices\n", xf86Msg(from, "%sutomatically enabling devices\n",
xf86Info.autoEnableDevices ? "A" : "Not a"); xf86Info.autoEnableDevices ? "A" : "Not a");
if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_GPU)) { if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_GPU)) {
xf86GetOptValBool(FlagOptions, FLAG_AUTO_ADD_GPU, xf86GetOptValBool(FlagOptions, FLAG_AUTO_ADD_GPU,
@ -788,8 +788,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else { else {
from = X_DEFAULT; from = X_DEFAULT;
} }
LogMessageVerb(from, 1, "%sutomatically adding GPU devices\n", xf86Msg(from, "%sutomatically adding GPU devices\n",
xf86Info.autoAddGPU ? "A" : "Not a"); xf86Info.autoAddGPU ? "A" : "Not a");
if (xf86AutoBindGPUDisabled) { if (xf86AutoBindGPUDisabled) {
xf86Info.autoBindGPU = FALSE; xf86Info.autoBindGPU = FALSE;
@ -803,8 +803,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else { else {
from = X_DEFAULT; from = X_DEFAULT;
} }
LogMessageVerb(from, 1, "%sutomatically binding GPU devices\n", xf86Msg(from, "%sutomatically binding GPU devices\n",
xf86Info.autoBindGPU ? "A" : "Not a"); xf86Info.autoBindGPU ? "A" : "Not a");
/* /*
* Set things up based on the config file information. Some of these * Set things up based on the config file information. Some of these
@ -827,16 +827,16 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
{ {
if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) { if ((s = xf86GetOptValString(FlagOptions, FLAG_LOG))) {
if (!xf86NameCmp(s, "flush")) { if (!xf86NameCmp(s, "flush")) {
LogMessageVerb(X_CONFIG, 1, "Flushing logfile enabled\n"); xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
LogSetParameter(XLOG_FLUSH, TRUE); LogSetParameter(XLOG_FLUSH, TRUE);
} }
else if (!xf86NameCmp(s, "sync")) { else if (!xf86NameCmp(s, "sync")) {
LogMessageVerb(X_CONFIG, 1, "Syncing logfile enabled\n"); xf86Msg(X_CONFIG, "Syncing logfile enabled\n");
LogSetParameter(XLOG_FLUSH, TRUE); LogSetParameter(XLOG_FLUSH, TRUE);
LogSetParameter(XLOG_SYNC, TRUE); LogSetParameter(XLOG_SYNC, TRUE);
} }
else { else {
LogMessageVerb(X_WARNING, 1, "Unknown Log option\n"); xf86Msg(X_WARNING, "Unknown Log option\n");
} }
} }
} }
@ -846,9 +846,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
int policy = PictureParseCmapPolicy(s); int policy = PictureParseCmapPolicy(s);
if (policy == PictureCmapPolicyInvalid) if (policy == PictureCmapPolicyInvalid)
LogMessageVerb(X_WARNING, 1, "Unknown colormap policy \"%s\"\n", s); xf86Msg(X_WARNING, "Unknown colormap policy \"%s\"\n", s);
else { else {
LogMessageVerb(X_CONFIG, 1, "Render colormap policy set to %s\n", s); xf86Msg(X_CONFIG, "Render colormap policy set to %s\n", s);
PictureCmapPolicy = policy; PictureCmapPolicy = policy;
} }
} }
@ -868,7 +868,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.glxVisuals = XF86_GlxVisualsAll; xf86Info.glxVisuals = XF86_GlxVisualsAll;
} }
else { else {
LogMessageVerb(X_WARNING, 1, "Unknown GlxVisuals option\n"); xf86Msg(X_WARNING, "Unknown GlxVisuals option\n");
} }
} }
@ -949,7 +949,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
from = X_CONFIG; from = X_CONFIG;
} }
if (!noPanoramiXExtension) if (!noPanoramiXExtension)
LogMessageVerb(from, 1, "Xinerama: enabled\n"); xf86Msg(from, "Xinerama: enabled\n");
#endif /* XINERAMA */ #endif /* XINERAMA */
#ifdef DRI2 #ifdef DRI2
@ -973,7 +973,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
LimitClients = i; LimitClients = i;
} }
} }
LogMessageVerb(from, 1, "Max clients allowed: %i, resource mask: 0x%x\n", xf86Msg(from, "Max clients allowed: %i, resource mask: 0x%x\n",
LimitClients, RESOURCE_ID_MASK); LimitClients, RESOURCE_ID_MASK);
} }
@ -1082,7 +1082,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
confInput = xf86findInput(xf86PointerName, confInput = xf86findInput(xf86PointerName,
xf86configptr->conf_input_lst); xf86configptr->conf_input_lst);
if (!confInput) { if (!confInput) {
LogMessageVerb(X_ERROR, 1, "No InputDevice section called \"%s\"\n", xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
xf86PointerName); xf86PointerName);
return FALSE; return FALSE;
} }
@ -1169,7 +1169,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
if (!foundPointer && xf86Info.forceInputDevices) { if (!foundPointer && xf86Info.forceInputDevices) {
/* This shouldn't happen. */ /* This shouldn't happen. */
LogMessageVerb(X_ERROR, 1, "Cannot locate a core pointer device.\n"); xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n");
xf86DeleteInput(Pointer, 0); xf86DeleteInput(Pointer, 0);
return FALSE; return FALSE;
} }
@ -1181,7 +1181,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
confInput = xf86findInput(xf86KeyboardName, confInput = xf86findInput(xf86KeyboardName,
xf86configptr->conf_input_lst); xf86configptr->conf_input_lst);
if (!confInput) { if (!confInput) {
LogMessageVerb(X_ERROR, 1, "No InputDevice section called \"%s\"\n", xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
xf86KeyboardName); xf86KeyboardName);
return FALSE; return FALSE;
} }
@ -1265,27 +1265,27 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
if (!foundKeyboard && xf86Info.forceInputDevices) { if (!foundKeyboard && xf86Info.forceInputDevices) {
/* This shouldn't happen. */ /* This shouldn't happen. */
LogMessageVerb(X_ERROR, 1, "Cannot locate a core keyboard device.\n"); xf86Msg(X_ERROR, "Cannot locate a core keyboard device.\n");
xf86DeleteInput(Keyboard, 0); xf86DeleteInput(Keyboard, 0);
return FALSE; return FALSE;
} }
if (pointerMsg) { if (pointerMsg) {
if (implicitLayout) if (implicitLayout)
LogMessageVerb(X_DEFAULT, 1, "No Layout section. Using the %s.\n", xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
pointerMsg); pointerMsg);
else else
LogMessageVerb(X_DEFAULT, 1, "The core pointer device wasn't specified " xf86Msg(X_DEFAULT, "The core pointer device wasn't specified "
"explicitly in the layout.\n" "explicitly in the layout.\n"
"\tUsing the %s.\n", pointerMsg); "\tUsing the %s.\n", pointerMsg);
} }
if (keyboardMsg) { if (keyboardMsg) {
if (implicitLayout) if (implicitLayout)
LogMessageVerb(X_DEFAULT, 1, "No Layout section. Using the %s.\n", xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
keyboardMsg); keyboardMsg);
else else
LogMessageVerb(X_DEFAULT, 1, "The core keyboard device wasn't specified " xf86Msg(X_DEFAULT, "The core keyboard device wasn't specified "
"explicitly in the layout.\n" "explicitly in the layout.\n"
"\tUsing the %s.\n", keyboardMsg); "\tUsing the %s.\n", keyboardMsg);
} }
@ -1301,15 +1301,15 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
#else #else
config_backend = "wscons"; config_backend = "wscons";
#endif #endif
LogMessageVerb(X_INFO, 1, "The server relies on %s to provide the list of " xf86Msg(X_INFO, "The server relies on %s to provide the list of "
"input devices.\n\tIf no devices become available, " "input devices.\n\tIf no devices become available, "
"reconfigure %s or disable AutoAddDevices.\n", "reconfigure %s or disable AutoAddDevices.\n",
config_backend, config_backend); config_backend, config_backend);
#else #else
LogMessageVerb(X_WARNING, 1, "Hotplugging requested but the server was " xf86Msg(X_WARNING, "Hotplugging requested but the server was "
"compiled without a config backend. " "compiled without a config backend. "
"No input devices were configured, the server " "No input devices were configured, the server "
"will start without any input devices.\n"); "will start without any input devices.\n");
#endif #endif
} }
@ -1406,13 +1406,13 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
} }
if (xf86LayoutName != NULL) { if (xf86LayoutName != NULL) {
if ((l = xf86findLayout(xf86LayoutName, conf_layout)) == NULL) { if ((l = xf86findLayout(xf86LayoutName, conf_layout)) == NULL) {
LogMessageVerb(X_ERROR, 1, "No ServerLayout section called \"%s\"\n", xf86Msg(X_ERROR, "No ServerLayout section called \"%s\"\n",
xf86LayoutName); xf86LayoutName);
return FALSE; return FALSE;
} }
conf_layout = l; conf_layout = l;
} }
LogMessageVerb(from, 1, "ServerLayout \"%s\"\n", conf_layout->lay_identifier); xf86Msg(from, "ServerLayout \"%s\"\n", conf_layout->lay_identifier);
adjp = conf_layout->lay_adjacency_lst; adjp = conf_layout->lay_adjacency_lst;
/* /*
@ -1532,8 +1532,8 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
} }
if (slp[i].where != PosObsolete if (slp[i].where != PosObsolete
&& slp[i].where != PosAbsolute && !slp[i].refscreen) { && slp[i].where != PosAbsolute && !slp[i].refscreen) {
LogMessageVerb(X_ERROR, 1, "Screen %s doesn't exist: deleting placement\n", xf86Msg(X_ERROR, "Screen %s doesn't exist: deleting placement\n",
slp[i].refname); slp[i].refname);
slp[i].where = PosAbsolute; slp[i].where = PosAbsolute;
slp[i].x = 0; slp[i].x = 0;
slp[i].y = 0; slp[i].y = 0;
@ -1613,8 +1613,8 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
from = X_CONFIG; from = X_CONFIG;
if (xf86ScreenName != NULL) { if (xf86ScreenName != NULL) {
if ((s = xf86findScreen(xf86ScreenName, conf_screen)) == NULL) { if ((s = xf86findScreen(xf86ScreenName, conf_screen)) == NULL) {
LogMessageVerb(X_ERROR, 1, "No Screen section called \"%s\"\n", xf86Msg(X_ERROR, "No Screen section called \"%s\"\n",
xf86ScreenName); xf86ScreenName);
return FALSE; return FALSE;
} }
conf_screen = s; conf_screen = s;
@ -1658,12 +1658,12 @@ configXvAdaptor(confXvAdaptorPtr adaptor, XF86ConfVideoAdaptorPtr conf_adaptor)
int count = 0; int count = 0;
XF86ConfVideoPortPtr conf_port; XF86ConfVideoPortPtr conf_port;
LogMessageVerb(X_CONFIG, 1, "| |-->VideoAdaptor \"%s\"\n", xf86Msg(X_CONFIG, "| |-->VideoAdaptor \"%s\"\n",
conf_adaptor->va_identifier); conf_adaptor->va_identifier);
adaptor->identifier = conf_adaptor->va_identifier; adaptor->identifier = conf_adaptor->va_identifier;
adaptor->options = conf_adaptor->va_option_lst; adaptor->options = conf_adaptor->va_option_lst;
if (conf_adaptor->va_busid || conf_adaptor->va_driver) { if (conf_adaptor->va_busid || conf_adaptor->va_driver) {
LogMessageVerb(X_CONFIG, 1, "| | Unsupported device type, skipping entry\n"); xf86Msg(X_CONFIG, "| | Unsupported device type, skipping entry\n");
return FALSE; return FALSE;
} }
@ -1704,11 +1704,11 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
memset(&local_conf_screen, 0, sizeof(local_conf_screen)); memset(&local_conf_screen, 0, sizeof(local_conf_screen));
conf_screen = &local_conf_screen; conf_screen = &local_conf_screen;
conf_screen->scrn_identifier = "Default Screen Section"; conf_screen->scrn_identifier = "Default Screen Section";
LogMessageVerb(X_DEFAULT, 1, "No screen section available. Using defaults.\n"); xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n");
} }
LogMessageVerb(from, 1, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier, xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
scrnum); scrnum);
/* /*
* now we fill in the elements of the screen * now we fill in the elements of the screen
*/ */
@ -1738,8 +1738,8 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
screenp->device = XNFcallocarray(1, sizeof(GDevRec)); screenp->device = XNFcallocarray(1, sizeof(GDevRec));
if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) { if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) {
FIND_SUITABLE (XF86ConfDevicePtr, xf86configptr->conf_device_lst, conf_screen->scrn_device); FIND_SUITABLE (XF86ConfDevicePtr, xf86configptr->conf_device_lst, conf_screen->scrn_device);
LogMessageVerb(X_DEFAULT, 1, "No device specified for screen \"%s\".\n" xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
"\tUsing the first device section listed.\n", screenp->id); "\tUsing the first device section listed.\n", screenp->id);
} }
if (configDevice(screenp->device, conf_screen->scrn_device, TRUE, FALSE)) { if (configDevice(screenp->device, conf_screen->scrn_device, TRUE, FALSE)) {
screenp->device->myScreenSection = screenp; screenp->device->myScreenSection = screenp;
@ -1846,8 +1846,8 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
} }
if (defaultMonitor) { if (defaultMonitor) {
LogMessageVerb(X_DEFAULT, 1, "No monitor specified for screen \"%s\".\n" xf86Msg(X_DEFAULT, "No monitor specified for screen \"%s\".\n"
"\tUsing a default monitor configuration.\n", screenp->id); "\tUsing a default monitor configuration.\n", screenp->id);
} }
return TRUE; return TRUE;
} }
@ -1878,7 +1878,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
float badgamma = 0.0; float badgamma = 0.0;
double maxPixClock; double maxPixClock;
LogMessageVerb(X_CONFIG, 1, "| |-->Monitor \"%s\"\n", conf_monitor->mon_identifier); xf86Msg(X_CONFIG, "| |-->Monitor \"%s\"\n", conf_monitor->mon_identifier);
monitorp->id = conf_monitor->mon_identifier; monitorp->id = conf_monitor->mon_identifier;
monitorp->vendor = conf_monitor->mon_vendor; monitorp->vendor = conf_monitor->mon_vendor;
monitorp->model = conf_monitor->mon_modelname; monitorp->model = conf_monitor->mon_modelname;
@ -2098,14 +2098,14 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active, Bool g
if (active) { if (active) {
if (gpu) if (gpu)
LogMessageVerb(X_CONFIG, 1, "| |-->GPUDevice \"%s\"\n", xf86Msg(X_CONFIG, "| |-->GPUDevice \"%s\"\n",
conf_device->dev_identifier); conf_device->dev_identifier);
else else
LogMessageVerb(X_CONFIG, 1, "| |-->Device \"%s\"\n", xf86Msg(X_CONFIG, "| |-->Device \"%s\"\n",
conf_device->dev_identifier); conf_device->dev_identifier);
} else } else
LogMessageVerb(X_CONFIG, 1, "|-->Inactive Device \"%s\"\n", xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n",
conf_device->dev_identifier); conf_device->dev_identifier);
devicep->identifier = conf_device->dev_identifier; devicep->identifier = conf_device->dev_identifier;
devicep->vendor = conf_device->dev_vendor; devicep->vendor = conf_device->dev_vendor;
@ -2199,17 +2199,17 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
enable = !enable; enable = !enable;
} }
else { else {
LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized value \"%s\"\n", val); xf86Msg(X_WARNING, "Ignoring unrecognized value \"%s\"\n", val);
free(n); free(n);
continue; continue;
} }
if (EnableDisableExtension(name, enable)) { if (EnableDisableExtension(name, enable)) {
LogMessageVerb(X_CONFIG, 1, "Extension \"%s\" is %s\n", xf86Msg(X_CONFIG, "Extension \"%s\" is %s\n",
name, enable ? "enabled" : "disabled"); name, enable ? "enabled" : "disabled");
} }
else { else {
LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized extension \"%s\"\n", xf86Msg(X_WARNING, "Ignoring unrecognized extension \"%s\"\n",
name); name);
} }
free(n); free(n);
@ -2220,7 +2220,7 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
static Bool static Bool
configInput(InputInfoPtr inputp, XF86ConfInputPtr conf_input, MessageType from) configInput(InputInfoPtr inputp, XF86ConfInputPtr conf_input, MessageType from)
{ {
LogMessageVerb(from, 1, "|-->Input Device \"%s\"\n", conf_input->inp_identifier); xf86Msg(from, "|-->Input Device \"%s\"\n", conf_input->inp_identifier);
inputp->name = conf_input->inp_identifier; inputp->name = conf_input->inp_identifier;
inputp->driver = conf_input->inp_driver; inputp->driver = conf_input->inp_driver;
inputp->options = conf_input->inp_option_lst; inputp->options = conf_input->inp_option_lst;
@ -2286,12 +2286,12 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout)
InputInfoPtr *current; InputInfoPtr *current;
if (!warned) { if (!warned) {
LogMessageVerb(X_WARNING, 1, "Hotplugging is on, devices using " xf86Msg(X_WARNING, "Hotplugging is on, devices using "
"drivers 'kbd', 'mouse' or 'vmmouse' will be disabled.\n"); "drivers 'kbd', 'mouse' or 'vmmouse' will be disabled.\n");
warned = TRUE; warned = TRUE;
} }
LogMessageVerb(X_WARNING, 1, "Disabling %s\n", (*dev)->name); xf86Msg(X_WARNING, "Disabling %s\n", (*dev)->name);
current = dev; current = dev;
free(*dev); free(*dev);
@ -2347,27 +2347,27 @@ xf86HandleConfigFile(Bool autoconfig)
dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT); dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT); filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
if (filename) { if (filename) {
LogMessageVerb(filefrom, 0, "Using config file: \"%s\"\n", filename); xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
xf86ConfigFile = XNFstrdup(filename); xf86ConfigFile = XNFstrdup(filename);
} }
else { else {
if (xf86ConfigFile) if (xf86ConfigFile)
LogMessageVerb(X_ERROR, 1, "Unable to locate/open config file: \"%s\"\n", xf86Msg(X_ERROR, "Unable to locate/open config file: \"%s\"\n",
xf86ConfigFile); xf86ConfigFile);
} }
if (dirname) { if (dirname) {
LogMessageVerb(dirfrom, 0, "Using config directory: \"%s\"\n", xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
dirname); dirname);
xf86ConfigDir = XNFstrdup(dirname); xf86ConfigDir = XNFstrdup(dirname);
} }
else { else {
if (xf86ConfigDir) if (xf86ConfigDir)
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Unable to locate/open config directory: \"%s\"\n", "Unable to locate/open config directory: \"%s\"\n",
xf86ConfigDir); xf86ConfigDir);
} }
if (sysdirname) if (sysdirname)
LogMessageVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n", xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
sysdirname); sysdirname);
if (!filename && !dirname && !sysdirname) if (!filename && !dirname && !sysdirname)
return CONFIG_NOFILE; return CONFIG_NOFILE;
@ -2378,7 +2378,7 @@ xf86HandleConfigFile(Bool autoconfig)
} }
if ((xf86configptr = xf86readConfigFile()) == NULL) { if ((xf86configptr = xf86readConfigFile()) == NULL) {
LogMessageVerb(X_ERROR, 1, "Problem parsing the config file\n"); xf86Msg(X_ERROR, "Problem parsing the config file\n");
return CONFIG_PARSE_ERROR; return CONFIG_PARSE_ERROR;
} }
xf86closeConfigFile(); xf86closeConfigFile();
@ -2400,14 +2400,14 @@ xf86HandleConfigFile(Bool autoconfig)
XF86ConfScreenPtr screen; XF86ConfScreenPtr screen;
if (xf86ScreenName == NULL) { if (xf86ScreenName == NULL) {
LogMessageVerb(X_DEFAULT, 1, xf86Msg(X_DEFAULT,
"No Layout section. Using the first Screen section.\n"); "No Layout section. Using the first Screen section.\n");
} }
FIND_SUITABLE (XF86ConfScreenPtr, xf86configptr->conf_screen_lst, screen); FIND_SUITABLE (XF86ConfScreenPtr, xf86configptr->conf_screen_lst, screen);
if (!configImpliedLayout(&xf86ConfigLayout, if (!configImpliedLayout(&xf86ConfigLayout,
screen, screen,
xf86configptr)) { xf86configptr)) {
LogMessageVerb(X_ERROR, 1, "Unable to determine the screen layout\n"); xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
return CONFIG_PARSE_ERROR; return CONFIG_PARSE_ERROR;
} }
implicit_layout = TRUE; implicit_layout = TRUE;
@ -2421,13 +2421,13 @@ xf86HandleConfigFile(Bool autoconfig)
dfltlayout = dfltlayout =
xf86SetStrOption(optlist, "defaultserverlayout", NULL); xf86SetStrOption(optlist, "defaultserverlayout", NULL);
if (!configLayout(&xf86ConfigLayout, layout, dfltlayout)) { if (!configLayout(&xf86ConfigLayout, layout, dfltlayout)) {
LogMessageVerb(X_ERROR, 1, "Unable to determine the screen layout\n"); xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
return CONFIG_PARSE_ERROR; return CONFIG_PARSE_ERROR;
} }
} }
else { else {
if (!configLayout(&xf86ConfigLayout, layout, NULL)) { if (!configLayout(&xf86ConfigLayout, layout, NULL)) {
LogMessageVerb(X_ERROR, 1, "Unable to determine the screen layout\n"); xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
return CONFIG_PARSE_ERROR; return CONFIG_PARSE_ERROR;
} }
} }
@ -2445,8 +2445,8 @@ xf86HandleConfigFile(Bool autoconfig)
} }
if (scanptr) { if (scanptr) {
if (strncmp(scanptr, "PCI:", 4) != 0) { if (strncmp(scanptr, "PCI:", 4) != 0) {
LogMessageVerb(X_WARNING, 1, "Bus types other than PCI not yet isolable.\n" xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
"\tIgnoring IsolateDevice option.\n"); "\tIgnoring IsolateDevice option.\n");
} }
else else
xf86PciIsolateDevice(scanptr); xf86PciIsolateDevice(scanptr);

8
hw/xfree86/common/xf86Configure.c
View File

@ -696,8 +696,8 @@ DoConfigure(void)
home, addslash); home, addslash);
if (xf86writeConfigFile(filename, xf86config) == 0) { if (xf86writeConfigFile(filename, xf86config) == 0) {
LogMessageVerb(X_ERROR, 1, "Unable to write config file: \"%s\": %s\n", xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
filename, strerror(errno)); filename, strerror(errno));
goto bail; goto bail;
} }
@ -802,8 +802,8 @@ DoConfigure(void)
} }
if (xf86writeConfigFile(filename, xf86config) == 0) { if (xf86writeConfigFile(filename, xf86config) == 0) {
LogMessageVerb(X_ERROR, 1, "Unable to write config file: \"%s\": %s\n", xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
filename, strerror(errno)); filename, strerror(errno));
goto bail; goto bail;
} }

6
hw/xfree86/common/xf86Cursor.c
View File

@ -588,9 +588,9 @@ xf86InitOrigins(void)
if (screen->refscreen != NULL && if (screen->refscreen != NULL &&
screen->refscreen->screennum >= xf86NumScreens) { screen->refscreen->screennum >= xf86NumScreens) {
screensLeft &= ~(1 << i); screensLeft &= ~(1 << i);
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"Not including screen \"%s\" in origins calculation.\n", "Not including screen \"%s\" in origins calculation.\n",
screen->screen->id); screen->screen->id);
continue; continue;
} }

2
hw/xfree86/common/xf86Events.c
View File

@ -163,7 +163,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
switch (action) { switch (action) {
case ACTION_TERMINATE: case ACTION_TERMINATE:
if (!xf86Info.dontZap) { if (!xf86Info.dontZap) {
LogMessageVerb(X_INFO, 1, "Server zapped. Shutting down.\n"); xf86Msg(X_INFO, "Server zapped. Shutting down.\n");
GiveUp(0); GiveUp(0);
} }
break; break;

28
hw/xfree86/common/xf86Helper.c
View File

@ -638,7 +638,7 @@ void
xf86PrintDepthBpp(ScrnInfoPtr scrp) xf86PrintDepthBpp(ScrnInfoPtr scrp)
{ {
xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth); xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth);
LogMessageVerb(scrp->bitsPerPixelFrom, 1, "framebuffer bpp %d\n", scrp->bitsPerPixel); xf86Msg(scrp->bitsPerPixelFrom, "framebuffer bpp %d\n", scrp->bitsPerPixel);
} }
/* /*
@ -1095,6 +1095,28 @@ xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
va_end(ap); va_end(ap);
} }
/* Print non-driver messages with verbose level specified directly */
void
xf86MsgVerb(MessageType type, int verb, const char *format, ...)
{
va_list ap;
va_start(ap, format);
LogVMessageVerb(type, verb, format, ap);
va_end(ap);
}
/* Print non-driver messages with verbose level of 1 (default) */
void
xf86Msg(MessageType type, const char *format, ...)
{
va_list ap;
va_start(ap, format);
LogVMessageVerb(type, 1, format, ap);
va_end(ap);
}
/* Just like ErrorF, but with the verbose level checked */ /* Just like ErrorF, but with the verbose level checked */
void void
xf86ErrorFVerb(int verb, const char *format, ...) xf86ErrorFVerb(int verb, const char *format, ...)
@ -1244,7 +1266,7 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
int len, i; int len, i;
len = 6 + strlen(drvname) + 2 + strlen(drvmsg) + 2; len = 6 + strlen(drvname) + 2 + strlen(drvmsg) + 2;
LogMessageVerb(X_INFO, 1, "%s: %s:", drvname, drvmsg); xf86Msg(X_INFO, "%s: %s:", drvname, drvmsg);
for (i = 0; chips[i].name != NULL; i++) { for (i = 0; chips[i].name != NULL; i++) {
if (i != 0) { if (i != 0) {
xf86ErrorF(","); xf86ErrorF(",");
@ -1698,7 +1720,7 @@ xf86IsUnblank(int mode)
case SCREEN_SAVER_CYCLE: case SCREEN_SAVER_CYCLE:
return FALSE; return FALSE;
default: default:
LogMessageVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode); xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);
return TRUE; return TRUE;
} }
} }

16
hw/xfree86/common/xf86Init.c
View File

@ -309,7 +309,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
t = time(NULL); t = time(NULL);
ct = ctime(&t); ct = ctime(&t);
LogMessageVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
xf86LogFile, ct); xf86LogFile, ct);
} }
@ -319,7 +319,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
case CONFIG_OK: case CONFIG_OK:
break; break;
case CONFIG_PARSE_ERROR: case CONFIG_PARSE_ERROR:
LogMessageVerb(X_ERROR, 1, "Error parsing the config file\n"); xf86Msg(X_ERROR, "Error parsing the config file\n");
return; return;
case CONFIG_NOFILE: case CONFIG_NOFILE:
autoconfig = TRUE; autoconfig = TRUE;
@ -351,7 +351,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (autoconfig) { if (autoconfig) {
if (!xf86AutoConfig()) { if (!xf86AutoConfig()) {
LogMessageVerb(X_ERROR, 1, "Auto configuration failed\n"); xf86Msg(X_ERROR, "Auto configuration failed\n");
return; return;
} }
} }
@ -374,7 +374,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
configured_device = xf86ConfigLayout.screens->screen->device; configured_device = xf86ConfigLayout.screens->screen->device;
if ((!configured_device) || (!configured_device->driver)) { if ((!configured_device) || (!configured_device->driver)) {
if (!autoConfigDevice(configured_device)) { if (!autoConfigDevice(configured_device)) {
LogMessageVerb(X_ERROR, 1, "Automatic driver configuration failed\n"); xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
return; return;
} }
} }
@ -404,7 +404,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
*/ */
if (xf86NumDrivers == 0) { if (xf86NumDrivers == 0) {
LogMessageVerb(X_ERROR, 1, "No drivers available.\n"); xf86Msg(X_ERROR, "No drivers available.\n");
return; return;
} }
@ -502,8 +502,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
*/ */
if (xf86NumScreens == 0) { if (xf86NumScreens == 0) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Screen(s) found, but none have a usable configuration.\n"); "Screen(s) found, but none have a usable configuration.\n");
return; return;
} }
@ -580,7 +580,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (xf86OSPMClose) if (xf86OSPMClose)
xf86OSPMClose(); xf86OSPMClose();
if ((xf86OSPMClose = xf86OSPMOpen()) != NULL) if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
LogMessageVerb(X_INFO, 3, "APM registered successfully\n"); xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
/* Make sure full I/O access is enabled */ /* Make sure full I/O access is enabled */
if (xorgHWAccess) if (xorgHWAccess)

2
hw/xfree86/common/xf86PM.c
View File

@ -208,7 +208,7 @@ xf86HandlePMEvents(int fd, void *data)
const char *str = NULL; const char *str = NULL;
int verb = eventName(events[i], &str); int verb = eventName(events[i], &str);
LogMessageVerb(X_INFO, verb, "PM Event received: %s\n", str); xf86MsgVerb(X_INFO, verb, "PM Event received: %s\n", str);
DoApmEvent(events[i], FALSE); DoApmEvent(events[i], FALSE);
switch (xf86PMConfirmEventToOs(fd, events[i])) { switch (xf86PMConfirmEventToOs(fd, events[i])) {
case PM_WAIT: case PM_WAIT:

9
hw/xfree86/common/xf86VGAarbiter.c
View File

@ -71,8 +71,8 @@ xf86VGAarbiterInit(void)
{ {
if (pci_device_vgaarb_init() != 0) { if (pci_device_vgaarb_init() != 0) {
vga_no_arb = 1; vga_no_arb = 1;
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"VGA arbiter: cannot open kernel arbiter, no multi-card support\n"); "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
} }
} }
@ -167,9 +167,8 @@ xf86VGAarbiterWrapFunctions(void)
if (vga_count < 2 || !xf86Screens) if (vga_count < 2 || !xf86Screens)
return FALSE; return FALSE;
LogMessageVerb(X_INFO, 1, xf86Msg(X_INFO, "Found %d VGA devices: arbiter wrapping enabled\n",
"Found %d VGA devices: arbiter wrapping enabled\n", vga_count);
vga_count);
for (i = 0; i < xf86NumScreens; i++) { for (i = 0; i < xf86NumScreens; i++) {
pScreen = xf86Screens[i]->pScreen; pScreen = xf86Screens[i]->pScreen;

116
hw/xfree86/common/xf86Xinput.c
View File

@ -110,12 +110,12 @@
#include "xkbsrv.h" #include "xkbsrv.h"
/* Valuator verification macro */ /* Valuator verification macro */
#define XI_VERIFY_VALUATORS(num_valuators) \ #define XI_VERIFY_VALUATORS(num_valuators) \
if (num_valuators > MAX_VALUATORS) { \ if (num_valuators > MAX_VALUATORS) { \
LogMessageVerb(X_ERROR, 1, "%s: num_valuator %d is greater than MAX_VALUATORS\n", \ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than" \
__FUNCTION__, num_valuators); \ " MAX_VALUATORS\n", __FUNCTION__, num_valuators); \
return; \ return; \
} }
static int static int
xf86InputDevicePostInit(DeviceIntPtr dev); xf86InputDevicePostInit(DeviceIntPtr dev);
@ -149,8 +149,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
/* common settings (available via device properties) */ /* common settings (available via device properties) */
tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0); tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);
if (tempf != 1.0) { if (tempf != 1.0) {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) constant deceleration by %.1f\n", xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",
devname, tempf); devname, tempf);
prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION); prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);
XIChangeDeviceProperty(pDev, prop, float_prop, 32, XIChangeDeviceProperty(pDev, prop, float_prop, 32,
PropModeReplace, 1, &tempf, FALSE); PropModeReplace, 1, &tempf, FALSE);
@ -158,8 +158,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0); tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);
if (tempf > 1.0) { if (tempf > 1.0) {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) adaptive deceleration by %.1f\n", xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",
devname, tempf); devname, tempf);
prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION); prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);
XIChangeDeviceProperty(pDev, prop, float_prop, 32, XIChangeDeviceProperty(pDev, prop, float_prop, 32,
PropModeReplace, 1, &tempf, FALSE); PropModeReplace, 1, &tempf, FALSE);
@ -172,11 +172,12 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER); prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);
if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32, if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,
PropModeReplace, 1, &tempi, FALSE) == Success) { PropModeReplace, 1, &tempi, FALSE) == Success) {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration profile %i\n", devname, tempi); xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,
tempi);
} }
else { else {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration profile %i is unknown\n", xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
devname, tempi); devname, tempi);
} }
/* set scaling */ /* set scaling */
@ -204,8 +205,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
tempf = xf86SetRealOption(list, "VelocityRelDiff", -1); tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);
if (tempf >= 0) { if (tempf >= 0) {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) max rel. velocity difference: %.1f%%\n", xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
devname, tempf * 100.0); devname, tempf * 100.0);
s->max_rel_diff = tempf; s->max_rel_diff = tempf;
} }
@ -251,18 +252,18 @@ ApplyAccelerationSettings(DeviceIntPtr dev)
} }
if (InitPointerAccelerationScheme(dev, scheme)) { if (InitPointerAccelerationScheme(dev, scheme)) {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) selected scheme %s/%i\n", xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
pInfo->name, schemeStr, scheme); pInfo->name, schemeStr, scheme);
} }
else { else {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) could not init scheme %s\n", xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
pInfo->name, schemeStr); pInfo->name, schemeStr);
scheme = dev->valuator->accelScheme.number; scheme = dev->valuator->accelScheme.number;
} }
} }
else { else {
LogMessageVerb(X_CONFIG, 1, "%s: (accel) keeping acceleration scheme %i\n", xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",
pInfo->name, scheme); pInfo->name, scheme);
} }
free(schemeStr); free(schemeStr);
@ -291,11 +292,11 @@ ApplyAccelerationSettings(DeviceIntPtr dev)
if (i >= 0) if (i >= 0)
dev->ptrfeed->ctrl.threshold = i; dev->ptrfeed->ctrl.threshold = i;
LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration factor: %.3f\n", xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
pInfo->name, ((float) dev->ptrfeed->ctrl.num) / pInfo->name, ((float) dev->ptrfeed->ctrl.num) /
((float) dev->ptrfeed->ctrl.den)); ((float) dev->ptrfeed->ctrl.den));
LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration threshold: %i\n", xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
pInfo->name, dev->ptrfeed->ctrl.threshold); pInfo->name, dev->ptrfeed->ctrl.threshold);
} }
} }
@ -318,9 +319,9 @@ ApplyTransformationMatrix(DeviceIntPtr dev)
&matrix[2], &matrix[3], &matrix[4], &matrix[5], &matrix[6], &matrix[2], &matrix[3], &matrix[4], &matrix[5], &matrix[6],
&matrix[7], &matrix[8]); &matrix[7], &matrix[8]);
if (rc != 9) { if (rc != 9) {
LogMessageVerb(X_ERROR,1, xf86Msg(X_ERROR,
"%s: invalid format for transformation matrix. Ignoring configuration.\n", "%s: invalid format for transformation matrix. Ignoring configuration.\n",
pInfo->name); pInfo->name);
return; return;
} }
@ -347,11 +348,11 @@ ApplyAutoRepeat(DeviceIntPtr dev)
return; return;
if (sscanf(repeatStr, "%ld %ld", &delay, &rate) != 2) { if (sscanf(repeatStr, "%ld %ld", &delay, &rate) != 2) {
LogMessageVerb(X_ERROR, 1, "\"%s\" is not a valid AutoRepeat value\n", repeatStr); xf86Msg(X_ERROR, "\"%s\" is not a valid AutoRepeat value\n", repeatStr);
return; return;
} }
LogMessageVerb(X_CONFIG, 1, "AutoRepeat: %ld %ld\n", delay, rate); xf86Msg(X_CONFIG, "AutoRepeat: %ld %ld\n", delay, rate);
xkbi->desc->ctrls->repeat_delay = delay; xkbi->desc->ctrls->repeat_delay = delay;
xkbi->desc->ctrls->repeat_interval = 1000 / rate; xkbi->desc->ctrls->repeat_interval = 1000 / rate;
} }
@ -372,11 +373,11 @@ xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr list)
!xf86SetBoolOption(list, "SendCoreEvents", 1) || !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
!xf86SetBoolOption(list, "CorePointer", 1) || !xf86SetBoolOption(list, "CorePointer", 1) ||
!xf86SetBoolOption(list, "CoreKeyboard", 1)) { !xf86SetBoolOption(list, "CoreKeyboard", 1)) {
LogMessageVerb(X_CONFIG, 1, "%s: doesn't report core events\n", pInfo->name); xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);
} }
else { else {
pInfo->flags |= XI86_ALWAYS_CORE; pInfo->flags |= XI86_ALWAYS_CORE;
LogMessageVerb(X_CONFIG, 1, "%s: always reports core events\n", pInfo->name); xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);
} }
} }
@ -398,7 +399,7 @@ xf86ActivateDevice(InputInfoPtr pInfo)
dev = AddInputDevice(serverClient, pInfo->device_control, TRUE); dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);
if (dev == NULL) { if (dev == NULL) {
LogMessageVerb(X_ERROR, 1, "Too many input devices. Ignoring %s\n", pInfo->name); xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n", pInfo->name);
pInfo->dev = NULL; pInfo->dev = NULL;
return NULL; return NULL;
} }
@ -415,9 +416,9 @@ xf86ActivateDevice(InputInfoPtr pInfo)
dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL); dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);
if (serverGeneration == 1) if (serverGeneration == 1)
LogMessageVerb(X_INFO, 1, xf86Msg(X_INFO,
"XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n", "XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n",
pInfo->name, pInfo->type_name, dev->id); pInfo->name, pInfo->type_name, dev->id);
return dev; return dev;
} }
@ -724,16 +725,16 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs)
free((void *) idev->driver); free((void *) idev->driver);
idev->driver = Xstrdup(cl->driver); idev->driver = Xstrdup(cl->driver);
if (!idev->driver) { if (!idev->driver) {
LogMessageVerb(X_ERROR, 1, "Failed to allocate memory while merging " xf86Msg(X_ERROR, "Failed to allocate memory while merging "
"InputClass configuration"); "InputClass configuration");
return BadAlloc; return BadAlloc;
} }
classopts = xf86ReplaceStrOption(classopts, "driver", idev->driver); classopts = xf86ReplaceStrOption(classopts, "driver", idev->driver);
} }
/* Apply options to device with InputClass settings preferred. */ /* Apply options to device with InputClass settings preferred. */
LogMessageVerb(X_CONFIG, 1, "%s: Applying InputClass \"%s\"\n", xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",
idev->name, cl->identifier); idev->name, cl->identifier);
idev->options = xf86optionListMerge(idev->options, classopts); idev->options = xf86optionListMerge(idev->options, classopts);
} }
@ -761,8 +762,8 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes * attrs)
} }
if (ignore) if (ignore)
LogMessageVerb(X_CONFIG, 1, "%s: Ignoring device from InputClass \"%s\"\n", xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",
idev->name, ignore_class); idev->name, ignore_class);
return ignore; return ignore;
} }
@ -914,10 +915,10 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
drv = xf86LoadInputDriver(pInfo->driver); drv = xf86LoadInputDriver(pInfo->driver);
if (!drv) { if (!drv) {
LogMessageVerb(X_ERROR, 1, "No input driver matching `%s'\n", pInfo->driver); xf86Msg(X_ERROR, "No input driver matching `%s'\n", pInfo->driver);
if (strlen(FALLBACK_INPUT_DRIVER) > 0) { if (strlen(FALLBACK_INPUT_DRIVER) > 0) {
LogMessageVerb(X_INFO, 1, "Falling back to input driver `%s'\n", xf86Msg(X_INFO, "Falling back to input driver `%s'\n",
FALLBACK_INPUT_DRIVER); FALLBACK_INPUT_DRIVER);
drv = xf86LoadInputDriver(FALLBACK_INPUT_DRIVER); drv = xf86LoadInputDriver(FALLBACK_INPUT_DRIVER);
if (drv) { if (drv) {
@ -931,13 +932,13 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
} }
} }
LogMessageVerb(X_INFO, 1, "Using input driver '%s' for '%s'\n", drv->driverName, xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName,
pInfo->name); pInfo->name);
if (!drv->PreInit) { if (!drv->PreInit) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Input driver `%s' has no PreInit function (ignoring)\n", "Input driver `%s' has no PreInit function (ignoring)\n",
drv->driverName); drv->driverName);
rval = BadImplementation; rval = BadImplementation;
goto unwind; goto unwind;
} }
@ -975,7 +976,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
input_unlock(); input_unlock();
if (rval != Success) { if (rval != Success) {
LogMessageVerb(X_ERROR, 1, "PreInit returned %d for \"%s\"\n", rval, pInfo->name); xf86Msg(X_ERROR, "PreInit returned %d for \"%s\"\n", rval, pInfo->name);
goto unwind; goto unwind;
} }
@ -986,14 +987,14 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
rval = ActivateDevice(dev, TRUE); rval = ActivateDevice(dev, TRUE);
if (rval != Success) { if (rval != Success) {
LogMessageVerb(X_ERROR, 1, "Couldn't init device \"%s\"\n", pInfo->name); xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
RemoveDevice(dev, TRUE); RemoveDevice(dev, TRUE);
goto unwind; goto unwind;
} }
rval = xf86InputDevicePostInit(dev); rval = xf86InputDevicePostInit(dev);
if (rval != Success) { if (rval != Success) {
LogMessageVerb(X_ERROR, 1, "Couldn't post-init device \"%s\"\n", pInfo->name); xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);
RemoveDevice(dev, TRUE); RemoveDevice(dev, TRUE);
goto unwind; goto unwind;
} }
@ -1003,7 +1004,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
input_lock(); input_lock();
EnableDevice(dev, TRUE); EnableDevice(dev, TRUE);
if (!dev->enabled) { if (!dev->enabled) {
LogMessageVerb(X_ERROR, 1, "Couldn't init device \"%s\"\n", pInfo->name); xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
RemoveDevice(dev, TRUE); RemoveDevice(dev, TRUE);
rval = BadMatch; rval = BadMatch;
input_unlock(); input_unlock();
@ -1108,14 +1109,15 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
} }
if (!pInfo->name) { if (!pInfo->name) {
LogMessageVerb(X_INFO, 1, "No identifier specified, ignoring this device.\n"); xf86Msg(X_INFO, "No identifier specified, ignoring this device.\n");
rval = BadRequest; rval = BadRequest;
goto unwind; goto unwind;
} }
if (!pInfo->driver) { if (!pInfo->driver) {
LogMessageVerb(X_INFO, 1, "No input driver specified, ignoring this device.\n"); xf86Msg(X_INFO, "No input driver specified, ignoring this device.\n");
LogMessageVerb(X_INFO, 1, "This device may have been added with another device file.\n"); xf86Msg(X_INFO,
"This device may have been added with another device file.\n");
rval = BadRequest; rval = BadRequest;
goto unwind; goto unwind;
} }
@ -1128,7 +1130,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
unwind: unwind:
if (is_auto && !xf86Info.autoAddDevices) if (is_auto && !xf86Info.autoAddDevices)
LogMessageVerb(X_INFO, 1, "AutoAddDevices is off - not adding device.\n"); xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");
xf86DeleteInput(pInfo, 0); xf86DeleteInput(pInfo, 0);
return rval; return rval;
} }

94
hw/xfree86/common/xf86pciBus.c
View File

@ -133,8 +133,8 @@ xf86PciProbe(void)
primaryBus.id.pci = info; primaryBus.id.pci = info;
} }
else { else {
LogMessageVerb(X_NOTICE, 1, xf86Msg(X_NOTICE,
"More than one possible primary device found\n"); "More than one possible primary device found\n");
primaryBus.type ^= (BusType) (-1); primaryBus.type ^= (BusType) (-1);
} }
} }
@ -154,10 +154,10 @@ xf86PciProbe(void)
if (xf86IsPrimaryPci(info)) if (xf86IsPrimaryPci(info))
prim = "*"; prim = "*";
LogMessageVerb(X_PROBED, 1, "PCI:%s(%u@%u:%u:%u) %04x:%04x:%04x:%04x ", prim, xf86Msg(X_PROBED, "PCI:%s(%u@%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
info->bus, info->domain, info->dev, info->func, info->bus, info->domain, info->dev, info->func,
info->vendor_id, info->device_id, info->vendor_id, info->device_id,
info->subvendor_id, info->subdevice_id); info->subvendor_id, info->subdevice_id);
xf86ErrorF("rev %d", info->revision); xf86ErrorF("rev %d", info->revision);
@ -825,11 +825,11 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
devList[j]->screen == instances[i].screen) { devList[j]->screen == instances[i].screen) {
if (devBus) if (devBus)
LogMessageVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"%s: More than one matching Device section for " "%s: More than one matching Device section for "
"instances\n\t(BusID: %s) found: %s\n", "instances\n\t(BusID: %s) found: %s\n",
driverName, devList[j]->busID, driverName, devList[j]->busID,
devList[j]->identifier); devList[j]->identifier);
else else
devBus = devList[j]; devBus = devList[j];
} }
@ -840,12 +840,13 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
* only assign to it to the primary device. * only assign to it to the primary device.
*/ */
if (xf86IsPrimaryPci(pPci)) { if (xf86IsPrimaryPci(pPci)) {
LogMessageVerb(X_PROBED, 1, "Assigning device section with no busID to primary device\n"); xf86Msg(X_PROBED, "Assigning device section with no busID"
" to primary device\n");
if (dev || devBus) if (dev || devBus)
LogMessageVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"%s: More than one matching Device section " "%s: More than one matching Device section "
"found: %s\n", driverName, "found: %s\n", driverName,
devList[j]->identifier); devList[j]->identifier);
else else
dev = devList[j]; dev = devList[j];
} }
@ -855,10 +856,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
dev = devBus; /* busID preferred */ dev = devBus; /* busID preferred */
if (!dev) { if (!dev) {
if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) { if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID PCI:%u@%u:%u:%u) found\n", "for instance (BusID PCI:%u@%u:%u:%u) found\n",
driverName, pPci->bus, pPci->domain, pPci->dev, driverName, pPci->bus, pPci->domain, pPci->dev,
pPci->func); pPci->func);
} }
} }
else { else {
@ -887,10 +888,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (c->token == -1) { if (c->token == -1) {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
"section \"%s\" isn't valid for this driver\n", "section \"%s\" isn't valid for this driver\n",
driverName, instances[i].dev->chipset, driverName, instances[i].dev->chipset,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
else { else {
instances[i].chip = c->token; instances[i].chip = c->token;
@ -900,17 +901,17 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
break; break;
} }
if (id->numChipset >= 0) { if (id->numChipset >= 0) {
LogMessageVerb(X_CONFIG, 1, "Chipset override: %s\n", xf86Msg(X_CONFIG, "Chipset override: %s\n",
instances[i].dev->chipset); instances[i].dev->chipset);
from = X_CONFIG; from = X_CONFIG;
} }
else { else {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
"section \"%s\" isn't a valid PCI chipset\n", "section \"%s\" isn't a valid PCI chipset\n",
driverName, instances[i].dev->chipset, driverName, instances[i].dev->chipset,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
} }
} }
@ -922,15 +923,16 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (id->numChipset == -1) { if (id->numChipset == -1) {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
LogMessageVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device " xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
"section \"%s\" isn't valid for this driver\n", "section \"%s\" isn't valid for this driver\n",
driverName, instances[i].dev->chipID, driverName, instances[i].dev->chipID,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
else { else {
instances[i].chip = id->numChipset; instances[i].chip = id->numChipset;
LogMessageVerb(X_CONFIG, 1, "ChipID override: 0x%04X\n",
instances[i].dev->chipID); xf86Msg(X_CONFIG, "ChipID override: 0x%04X\n",
instances[i].dev->chipID);
from = X_CONFIG; from = X_CONFIG;
} }
} }
@ -947,7 +949,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (c->token == instances[i].chip) if (c->token == instances[i].chip)
break; break;
} }
LogMessageVerb(from, 1, "Chipset %s found\n", c->name); xf86Msg(from, "Chipset %s found\n", c->name);
} }
} }
@ -1308,9 +1310,9 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
if (!idsdir) if (!idsdir)
return; return;
LogMessageVerb(X_INFO, 1, xf86Msg(X_INFO,
"Scanning %s directory for additional PCI ID's supported by the drivers\n", "Scanning %s directory for additional PCI ID's supported by the drivers\n",
PCI_TXT_IDS_PATH); PCI_TXT_IDS_PATH);
direntry = readdir(idsdir); direntry = readdir(idsdir);
/* Read the directory */ /* Read the directory */
while (direntry) { while (direntry) {
@ -1326,8 +1328,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
PCI_TXT_IDS_PATH, direntry->d_name); PCI_TXT_IDS_PATH, direntry->d_name);
fp = fopen(path_name, "r"); fp = fopen(path_name, "r");
if (fp == NULL) { if (fp == NULL) {
LogMessageVerb(X_ERROR, 1, "Could not open %s for reading. Exiting.\n", xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n",
path_name); path_name);
goto end; goto end;
} }
/* Read the file */ /* Read the file */
@ -1361,8 +1363,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
(char *) malloc(sizeof(char) * (char *) malloc(sizeof(char) *
strlen(direntry->d_name) - 3); strlen(direntry->d_name) - 3);
if (!tmpMatch) { if (!tmpMatch) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Could not allocate space for the module name. Exiting.\n"); "Could not allocate space for the module name. Exiting.\n");
goto end; goto end;
} }
/* hack off the .ids suffix. This should guard /* hack off the .ids suffix. This should guard
@ -1378,8 +1380,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
} }
} }
xf86AddMatchedDriver(md, tmpMatch); xf86AddMatchedDriver(md, tmpMatch);
LogMessageVerb(X_INFO, 1, "Matched %s from file name %s\n", xf86Msg(X_INFO, "Matched %s from file name %s\n",
tmpMatch, direntry->d_name); tmpMatch, direntry->d_name);
free(tmpMatch); free(tmpMatch);
} }
} }

32
hw/xfree86/common/xf86platformBus.c
View File

@ -233,9 +233,9 @@ xf86OutputClassDriverList(int index, XF86MatchedDrivers *md)
if (OutputClassMatches(cl, &xf86_platform_devices[index])) { if (OutputClassMatches(cl, &xf86_platform_devices[index])) {
char *path = xf86_platform_odev_attributes(index)->path; char *path = xf86_platform_odev_attributes(index)->path;
LogMessageVerb(X_INFO, 1, "Applying OutputClass \"%s\" to %s\n", xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n",
cl->identifier, path); cl->identifier, path);
LogMessageVerb(X_NONE, 1, "\tloading driver: %s\n", cl->driver); xf86Msg(X_NONE, "\tloading driver: %s\n", cl->driver);
xf86AddMatchedDriver(md, cl->driver); xf86AddMatchedDriver(md, cl->driver);
} }
@ -283,7 +283,7 @@ void xf86PlatformScanPciDev(void)
if (!xf86scanpci()) if (!xf86scanpci())
return; return;
LogMessageVerb(X_CONFIG, 1, "Scanning the platform PCI devices\n"); xf86Msg(X_CONFIG, "Scanning the platform PCI devices\n");
for (i = 0; i < xf86_num_platform_devices; i++) { for (i = 0; i < xf86_num_platform_devices; i++) {
char *busid = xf86_platform_odev_attributes(i)->busid; char *busid = xf86_platform_odev_attributes(i)->busid;
@ -327,8 +327,8 @@ xf86platformProbe(void)
XNFasprintf(&path, "%s,%s", cl->modulepath, XNFasprintf(&path, "%s,%s", cl->modulepath,
path ? path : xf86ModulePath); path ? path : xf86ModulePath);
free(old_path); free(old_path);
LogMessageVerb(X_CONFIG, 1, "OutputClass \"%s\" ModulePath extended to \"%s\"\n", xf86Msg(X_CONFIG, "OutputClass \"%s\" ModulePath extended to \"%s\"\n",
cl->identifier, path); cl->identifier, path);
LoaderSetPath(path); LoaderSetPath(path);
} }
} }
@ -344,8 +344,8 @@ xf86platformProbe(void)
continue; continue;
if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) { if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) {
LogMessageVerb(X_CONFIG, 1, "OutputClass \"%s\" setting %s as PrimaryGPU\n", xf86Msg(X_CONFIG, "OutputClass \"%s\" setting %s as PrimaryGPU\n",
cl->identifier, dev->attribs->path); cl->identifier, dev->attribs->path);
primaryBus.type = BUS_PLATFORM; primaryBus.type = BUS_PLATFORM;
primaryBus.id.plat = dev; primaryBus.id.plat = dev;
return 0; return 0;
@ -395,8 +395,8 @@ xf86MergeOutputClassOptions(int entityIndex, void **options)
} }
break; break;
default: default:
LogMessageVerb(X_DEBUG, 1, "xf86MergeOutputClassOptions unsupported bus type %d\n", xf86Msg(X_DEBUG, "xf86MergeOutputClassOptions unsupported bus type %d\n",
entity->bus.type); entity->bus.type);
} }
if (!dev) if (!dev)
@ -406,8 +406,8 @@ xf86MergeOutputClassOptions(int entityIndex, void **options)
if (!OutputClassMatches(cl, dev) || !cl->option_lst) if (!OutputClassMatches(cl, dev) || !cl->option_lst)
continue; continue;
LogMessageVerb(X_INFO, 1, "Applying OutputClass \"%s\" options to %s\n", xf86Msg(X_INFO, "Applying OutputClass \"%s\" options to %s\n",
cl->identifier, dev->attribs->path); cl->identifier, dev->attribs->path);
classopts = xf86optionListDup(cl->option_lst); classopts = xf86optionListDup(cl->option_lst);
*options = xf86optionListMerge(*options, classopts); *options = xf86optionListMerge(*options, classopts);
@ -653,8 +653,8 @@ xf86PlatformFindHotplugDriver(int dev_index)
} }
/* Return the first driver from the match list */ /* Return the first driver from the match list */
LogMessageVerb(X_INFO, 1, "matching hotplug-driver is %s\n", xf86Msg(X_INFO, "matching hotplug-driver is %s\n",
hp_driver ? hp_driver : "none"); hp_driver ? hp_driver : "none");
return hp_driver; return hp_driver;
} }
@ -811,13 +811,13 @@ void xf86platformPrimary(void)
{ {
/* use the first platform device as a fallback */ /* use the first platform device as a fallback */
if (primaryBus.type == BUS_NONE) { if (primaryBus.type == BUS_NONE) {
LogMessageVerb(X_INFO, 1, "no primary bus or device found\n"); xf86Msg(X_INFO, "no primary bus or device found\n");
if (xf86_num_platform_devices > 0) { if (xf86_num_platform_devices > 0) {
primaryBus.id.plat = &xf86_platform_devices[0]; primaryBus.id.plat = &xf86_platform_devices[0];
primaryBus.type = BUS_PLATFORM; primaryBus.type = BUS_PLATFORM;
LogMessageVerb(X_NONE, 1, "\tfalling back to %s\n", primaryBus.id.plat->attribs->syspath); xf86Msg(X_NONE, "\tfalling back to %s\n", primaryBus.id.plat->attribs->syspath);
} }
} }
} }

46
hw/xfree86/common/xf86sbusBus.c
View File

@ -224,7 +224,7 @@ xf86SbusProbe(void)
break; break;
} }
LogMessageVerb(X_PROBED, 1, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr); xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
promPath = sparcPromNode2Pathname(&psdp->node); promPath = sparcPromNode2Pathname(&psdp->node);
if (promPath) { if (promPath) {
xf86ErrorF(" at %s", promPath); xf86ErrorF(" at %s", promPath);
@ -232,7 +232,7 @@ xf86SbusProbe(void)
} }
} }
else else
LogMessageVerb(X_PROBED, 1, "SBUS: %s", psdp->descr); xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
xf86ErrorF("\n"); xf86ErrorF("\n");
} }
if (useProm) if (useProm)
@ -464,11 +464,11 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
if (devList[j]->busID && *devList[j]->busID) { if (devList[j]->busID && *devList[j]->busID) {
if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) { if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
if (devBus) if (devBus)
LogMessageVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"%s: More than one matching Device section for " "%s: More than one matching Device section for "
"instance (BusID: %s) found: %s\n", "instance (BusID: %s) found: %s\n",
driverName, devList[j]->identifier, driverName, devList[j]->identifier,
devList[j]->busID); devList[j]->busID);
else else
devBus = devList[j]; devBus = devList[j];
} }
@ -476,34 +476,34 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
else { else {
if (!dev && !devBus) { if (!dev && !devBus) {
if (promPath) if (promPath)
LogMessageVerb(X_PROBED, 1, xf86Msg(X_PROBED,
"Assigning device section with no busID to SBUS:%s\n", "Assigning device section with no busID to SBUS:%s\n",
promPath); promPath);
else else
LogMessageVerb(X_PROBED, 1, xf86Msg(X_PROBED,
"Assigning device section with no busID to SBUS:fb%d\n", "Assigning device section with no busID to SBUS:fb%d\n",
psdp->fbNum); psdp->fbNum);
dev = devList[j]; dev = devList[j];
} }
else else
LogMessageVerb(X_WARNING, 0, xf86MsgVerb(X_WARNING, 0,
"%s: More than one matching Device section " "%s: More than one matching Device section "
"found: %s\n", driverName, "found: %s\n", driverName,
devList[j]->identifier); devList[j]->identifier);
} }
} }
if (devBus) if (devBus)
dev = devBus; /* busID preferred */ dev = devBus; /* busID preferred */
if (!dev && psdp->fd != -2) { if (!dev && psdp->fd != -2) {
if (promPath) { if (promPath) {
LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID SBUS:%s) found\n", "for instance (BusID SBUS:%s) found\n",
driverName, promPath); driverName, promPath);
} }
else else
LogMessageVerb(X_WARNING, 0, "%s: No matching Device section " xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID SBUS:fb%d) found\n", "for instance (BusID SBUS:fb%d) found\n",
driverName, psdp->fbNum); driverName, psdp->fbNum);
} }
else if (dev) { else if (dev) {
numClaimedInstances++; numClaimedInstances++;

8
hw/xfree86/ddc/interpret_edid.c
View File

@ -89,8 +89,8 @@ handle_edid_quirks(xf86MonPtr m)
xf86ForEachDetailedBlock(m, find_max_detailed_clock, &clock); xf86ForEachDetailedBlock(m, find_max_detailed_clock, &clock);
if (clock && (ranges->max_clock * 1e6 < clock)) { if (clock && (ranges->max_clock * 1e6 < clock)) {
LogMessageVerb(X_WARNING, 1, "EDID timing clock %.2f exceeds claimed max " xf86Msg(X_WARNING, "EDID timing clock %.2f exceeds claimed max "
"%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock); "%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock);
ranges->max_clock = (clock + 999999) / 1e6; ranges->max_clock = (clock + 999999) / 1e6;
} }
} }
@ -159,8 +159,8 @@ encode_aspect_ratio(xf86MonPtr m)
m->features.vsize = (p.real_vsize + 5) / 10; m->features.vsize = (p.real_vsize + 5) / 10;
} }
LogMessageVerb(X_INFO, 1, "Quirked EDID physical size to %dx%d cm\n", xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
m->features.hsize, m->features.vsize); m->features.hsize, m->features.vsize);
} }
} }

11
hw/xfree86/doc/ddxDesign.xml
View File

@ -5630,6 +5630,17 @@ strongly encouraged to improve the consistency of driver behaviour.
</blockquote></para></blockquote> </blockquote></para></blockquote>
<blockquote><para>
<programlisting>
xf86MsgVerb(MessageType type, int verb, const char *format, ...);
</programlisting>
<blockquote><para>
Like <function>xf86Msg()</function>, but with the verbosity level given
explicitly.
</para>
</blockquote></para></blockquote>
<blockquote><para> <blockquote><para>
<programlisting> <programlisting>
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...); xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...);

2
hw/xfree86/fbdevhw/fbdevhwstub.c
View File

@ -28,7 +28,7 @@ fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
Bool Bool
fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device) fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
{ {
LogMessageVerb(X_ERROR, 1, "fbdevhw is not available on this platform\n"); xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n");
return FALSE; return FALSE;
} }

6
hw/xfree86/i2c/xf86i2c.c
View File

@ -752,9 +752,9 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too)
} }
else { else {
if (unalloc) { if (unalloc) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"i2c bug: Attempt to remove I2C bus \"%s\", " "i2c bug: Attempt to remove I2C bus \"%s\", "
"but device list is not empty.\n", b->BusName); "but device list is not empty.\n", b->BusName);
return; return;
} }
} }

2
hw/xfree86/int10/helper_exec.c
View File

@ -211,7 +211,7 @@ stack_trace(xf86Int10InfoPtr pInt)
if (stack >= tail) if (stack >= tail)
return; return;
LogMessageVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack); xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack);
for (; stack < tail; stack++) { for (; stack < tail; stack++) {
xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack)); xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
i = (i + 1) % 0x10; i = (i + 1) % 0x10;

28
hw/xfree86/os-support/bsd/alpha_video.c
View File

@ -67,7 +67,7 @@ dense_base(void)
init_abw(); init_abw();
/* XXX check abst_flags for ABST_DENSE just to be safe? */ /* XXX check abst_flags for ABST_DENSE just to be safe? */
LogMessageVerb(X_INFO, 1, "dense base = %#lx\n", abw[0].abw_abst.abst_sys_start); xf86Msg(X_INFO, "dense base = %#lx\n", abw[0].abw_abst.abst_sys_start); /* XXXX */
return abw[0].abw_abst.abst_sys_start; return abw[0].abw_abst.abst_sys_start;
} }
@ -112,14 +112,14 @@ checkDevMem(Bool warn)
if (base != MAP_FAILED) { if (base != MAP_FAILED) {
munmap((caddr_t) base, 4096); munmap((caddr_t) base, 4096);
devMemFd = fd; devMemFd = fd;
LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n", xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
DEV_APERTURE); DEV_APERTURE);
return; return;
} }
else { else {
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_APERTURE, strerror(errno)); DEV_APERTURE, strerror(errno));
} }
} }
} }
@ -136,23 +136,23 @@ checkDevMem(Bool warn)
} }
else { else {
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
} }
} }
if (warn) { if (warn) {
#ifndef HAS_APERTURE_DRV #ifndef HAS_APERTURE_DRV
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open/mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
#else #else
#ifndef __OpenBSD__ #ifndef __OpenBSD__
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n" xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno)); "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
#else /* __OpenBSD__ */ #else /* __OpenBSD__ */
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n" xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno), "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
SYSCTL_MSG); SYSCTL_MSG);
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
#endif #endif
xf86ErrorF("\tlinear framebuffer access unavailable\n"); xf86ErrorF("\tlinear framebuffer access unavailable\n");

22
hw/xfree86/os-support/bsd/arm_video.c
View File

@ -109,15 +109,15 @@ checkDevMem(Bool warn)
else { else {
/* This should not happen */ /* This should not happen */
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
return; return;
} }
} }
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
return; return;
} }
@ -140,8 +140,8 @@ xf86EnableIO()
return TRUE; return TRUE;
if ((IoFd = open("/dev/io", O_RDWR)) == -1) { if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING, "xf86EnableIO: "
"xf86EnableIO: Failed to open /dev/io for extended I/O\n"); "Failed to open /dev/io for extended I/O\n");
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -182,16 +182,14 @@ xf86EnableIO()
IOPortBase = base; IOPortBase = base;
} }
else { else {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING, "EnableIO: failed to mmap %s (%s)\n",
"EnableIO: failed to mmap /dev/ttyC0 (%s)\n", "/dev/ttyC0", strerror(errno));
strerror(errno));
return FALSE; return FALSE;
} }
} }
else { else {
LogMessageVerb(X_WARNING, 1, xf86Msg("EnableIO: failed to open %s (%s)\n",
"EnableIO: failed to open /dev/ttyC0 (%s)\n", "/dev/ttyC0", strerror(errno));
strerror(errno));
return FALSE; return FALSE;
} }

44
hw/xfree86/os-support/bsd/bsd_init.c
View File

@ -230,9 +230,9 @@ xf86OpenConsole(void)
* /dev/console * /dev/console
*/ */
if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) { if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86OpenConsole: couldn't open /dev/console (%s)\n", "xf86OpenConsole: couldn't open /dev/console (%s)\n",
strerror(errno)); strerror(errno));
} }
break; break;
#endif #endif
@ -259,7 +259,7 @@ xf86OpenConsole(void)
if (initialVT != 1) { if (initialVT != 1) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0) {
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n"); xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
sleep(1); sleep(1);
} }
@ -274,14 +274,14 @@ xf86OpenConsole(void)
SYSCALL(result = SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno)); ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
if (result != 0) { if (result != 0) {
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n"); xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
SYSCALL(result = SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_WAITACTIVE, ioctl(xf86Info.consoleFd, VT_WAITACTIVE,
xf86Info.vtno)); xf86Info.vtno));
if (result != 0) { if (result != 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86OpenConsole: VT_WAITACTIVE failed\n"); "xf86OpenConsole: VT_WAITACTIVE failed\n");
} }
OsSignal(SIGUSR1, xf86VTRequest); OsSignal(SIGUSR1, xf86VTRequest);
@ -321,7 +321,7 @@ xf86OpenConsole(void)
if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch && if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch &&
(xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) { (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n"); xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
} }
} }
#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
@ -347,7 +347,7 @@ xf86OpenPccons(void)
CHECK_DRIVER_MSG); CHECK_DRIVER_MSG);
} }
xf86Info.consType = PCCONS; xf86Info.consType = PCCONS;
LogMessageVerb(X_PROBED, 1, "Using pccons driver with X support\n"); xf86Msg(X_PROBED, "Using pccons driver with X support\n");
} }
return fd; return fd;
} }
@ -439,7 +439,7 @@ xf86OpenSyscons(void)
FatalError("xf86OpenSyscons: VT_GETMODE failed"); FatalError("xf86OpenSyscons: VT_GETMODE failed");
} }
xf86Info.consType = SYSCONS; xf86Info.consType = SYSCONS;
LogMessageVerb(X_PROBED, 1, "Using syscons driver with X support"); xf86Msg(X_PROBED, "Using syscons driver with X support");
if (syscons_version >= 0x100) { if (syscons_version >= 0x100) {
xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8, xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
syscons_version & 0xFF); syscons_version & 0xFF);
@ -447,7 +447,7 @@ xf86OpenSyscons(void)
else { else {
xf86ErrorF(" (version 0.x)\n"); xf86ErrorF(" (version 0.x)\n");
} }
LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno); xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
} }
else { else {
/* VT_GETMODE failed, probably not syscons */ /* VT_GETMODE failed, probably not syscons */
@ -542,21 +542,21 @@ xf86OpenPcvt(void)
xf86Info.consType = PCVT; xf86Info.consType = PCVT;
#ifdef WSCONS_SUPPORT #ifdef WSCONS_SUPPORT
#ifdef __NetBSD__ #ifdef __NetBSD__
LogMessageVerb(X_PROBED, 1, xf86Msg(X_PROBED,
"Using wscons driver on %s in pcvt compatibility mode " "Using wscons driver on %s in pcvt compatibility mode "
"(version %d.%d)\n", vtname, "(version %d.%d)\n", vtname,
pcvt_version.rmajor, pcvt_version.rminor); pcvt_version.rmajor, pcvt_version.rminor);
#else #else
LogMessageVerb(X_PROBED, 1, xf86Msg(X_PROBED,
"Using wscons driver on %s in pcvt compatibility mode ", "Using wscons driver on %s in pcvt compatibility mode ",
vtname); vtname);
#endif #endif
#else #else
# ifdef __NetBSD__ # ifdef __NetBSD__
LogMessageVerb(X_PROBED, 1, "Using pcvt driver (version %d.%d)\n", xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
pcvt_version.rmajor, pcvt_version.rminor); pcvt_version.rmajor, pcvt_version.rminor);
# else # else
LogMessageVerb(X_PROBED, 1, "Using pcvt driver\n"); xf86Msg(X_PROBED, "Using pcvt driver\n");
# endif # endif
#endif #endif
#ifdef __NetBSD__ #ifdef __NetBSD__
@ -599,7 +599,7 @@ xf86OpenWScons(void)
"xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG); "xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG);
} }
xf86Info.consType = WSCONS; xf86Info.consType = WSCONS;
LogMessageVerb(X_PROBED, 1, "Using wscons driver\n"); xf86Msg(X_PROBED, "Using wscons driver\n");
} }
return fd; return fd;
} }

53
hw/xfree86/os-support/bsd/i386_video.c
View File

@ -96,8 +96,8 @@ checkDevMem(Bool warn)
else { else {
/* This should not happen */ /* This should not happen */
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
useDevMem = FALSE; useDevMem = FALSE;
return; return;
@ -105,8 +105,8 @@ checkDevMem(Bool warn)
} }
#ifndef HAS_APERTURE_DRV #ifndef HAS_APERTURE_DRV
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
DEV_MEM, strerror(errno)); DEV_MEM, strerror(errno));
} }
useDevMem = FALSE; useDevMem = FALSE;
return; return;
@ -121,27 +121,27 @@ checkDevMem(Bool warn)
munmap((caddr_t) base, 4096); munmap((caddr_t) base, 4096);
devMemFd = fd; devMemFd = fd;
useDevMem = TRUE; useDevMem = TRUE;
LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n", xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
DEV_APERTURE); DEV_APERTURE);
return; return;
} }
else { else {
if (warn) { if (warn) {
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n", xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
DEV_APERTURE, strerror(errno)); DEV_APERTURE, strerror(errno));
} }
} }
} }
else { else {
if (warn) { if (warn) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n" xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno)); "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
#else /* __OpenBSD__ */ #else /* __OpenBSD__ */
LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n" xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
"\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno), "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
SYSCTL_MSG); SYSCTL_MSG);
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
} }
} }
@ -177,9 +177,11 @@ xf86EnableIO(void)
if (i386_iopl(TRUE) < 0) { if (i386_iopl(TRUE) < 0) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O"); xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
"xf86EnableIO");
#else #else
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG); xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
"xf86EnableIO", SYSCTL_MSG);
#endif #endif
return FALSE; return FALSE;
} }
@ -220,9 +222,11 @@ xf86EnableIO(void)
if (amd64_iopl(TRUE) < 0) { if (amd64_iopl(TRUE) < 0) {
#ifndef __OpenBSD__ #ifndef __OpenBSD__
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O"); xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O",
"xf86EnableIO");
#else #else
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for extended I/O\n%s", SYSCTL_MSG); xf86Msg(X_WARNING, "%s: Failed to set IOPL for extended I/O\n%s",
"xf86EnableIO", SYSCTL_MSG);
#endif #endif
return FALSE; return FALSE;
} }
@ -258,7 +262,8 @@ xf86EnableIO(void)
return TRUE; return TRUE;
if ((IoFd = open("/dev/io", O_RDWR)) == -1) { if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to open /dev/io for extended I/O"); xf86Msg(X_WARNING, "xf86EnableIO: "
"Failed to open /dev/io for extended I/O");
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -289,9 +294,9 @@ xf86SetTVOut(int mode)
case PCCONS:{ case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) { if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to TV output, %s\n", "xf86SetTVOut: Could not set console to TV output, %s\n",
strerror(errno)); strerror(errno));
} }
} }
break; break;
@ -312,9 +317,9 @@ xf86SetRGBOut(void)
case PCCONS:{ case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) { if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to RGB output, %s\n", "xf86SetTVOut: Could not set console to RGB output, %s\n",
strerror(errno)); strerror(errno));
} }
} }
break; break;

6
hw/xfree86/os-support/bsd/ppc_video.c
View File

@ -60,13 +60,13 @@ xf86EnableIO()
{ {
int fd = xf86Info.consoleFd; int fd = xf86Info.consoleFd;
LogMessageVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED) { if (ioBase == MAP_FAILED) {
ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
0xf2000000); 0xf2000000);
LogMessageVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase); xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
if (ioBase == MAP_FAILED) { if (ioBase == MAP_FAILED) {
LogMessageVerb(X_WARNING, 3, "Can't map IO space!\n"); xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
return FALSE; return FALSE;
} }
} }

4
hw/xfree86/os-support/linux/lnx_acpi.c
View File

@ -149,7 +149,7 @@ lnxACPIOpen(void)
strcpy(addr.sun_path, ACPI_SOCKET); strcpy(addr.sun_path, ACPI_SOCKET);
if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) { if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) {
if (!warned) if (!warned)
LogMessageVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n", xf86MsgVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n",
ACPI_SOCKET, strerror(errno)); ACPI_SOCKET, strerror(errno));
warned = 1; warned = 1;
shutdown(fd, 2); shutdown(fd, 2);
@ -161,7 +161,7 @@ lnxACPIOpen(void)
xf86PMGetEventFromOs = lnxACPIGetEventFromOs; xf86PMGetEventFromOs = lnxACPIGetEventFromOs;
xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs; xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
ACPIihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); ACPIihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
LogMessageVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET); xf86MsgVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET);
warned = 0; warned = 0;
return lnxCloseACPI; return lnxCloseACPI;

4
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -165,7 +165,7 @@ lnxAPMOpen(void)
DebugF("APM: Opening device\n"); DebugF("APM: Opening device\n");
if ((fd = open(APM_DEVICE, O_RDWR)) > -1) { if ((fd = open(APM_DEVICE, O_RDWR)) > -1) {
if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) { if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) {
LogMessageVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n", xf86MsgVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n",
APM_PROC, strerror(errno)); APM_PROC, strerror(errno));
close(fd); close(fd);
return NULL; return NULL;
@ -175,7 +175,7 @@ lnxAPMOpen(void)
xf86PMGetEventFromOs = lnxPMGetEventFromOs; xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs; xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
LogMessageVerb(X_INFO, 3, "Open APM successful\n"); xf86MsgVerb(X_INFO, 3, "Open APM successful\n");
return lnxCloseAPM; return lnxCloseAPM;
} }
return NULL; return NULL;

40
hw/xfree86/os-support/linux/lnx_init.c
View File

@ -73,13 +73,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
if (ret < 0) { if (ret < 0) {
LogMessageVerb(X_WARNING, 1, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno)); xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
return 0; return 0;
} }
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
if (ret < 0) { if (ret < 0) {
LogMessageVerb(X_WARNING, 1, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno)); xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
return 0; return 0;
} }
@ -145,7 +145,7 @@ linux_parse_vt_settings(int may_fail)
close(fd); close(fd);
} }
LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno); xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
/* Some of stdin / stdout / stderr maybe redirected to a file */ /* Some of stdin / stdout / stderr maybe redirected to a file */
for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) { for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
@ -157,9 +157,9 @@ linux_parse_vt_settings(int may_fail)
} }
if (!KeepTty && current_vt == xf86Info.vtno) { if (!KeepTty && current_vt == xf86Info.vtno) {
LogMessageVerb(X_PROBED, 1, xf86Msg(X_PROBED,
"controlling tty is VT number %d, auto-enabling KeepTty\n", "controlling tty is VT number %d, auto-enabling KeepTty\n",
current_vt); current_vt);
KeepTty = TRUE; KeepTty = TRUE;
} }
@ -196,13 +196,13 @@ xf86OpenConsole(void)
* group leader * group leader
*/ */
if (setpgid(0, ppgid) < 0) if (setpgid(0, ppgid) < 0)
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setpgid failed: %s\n", xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
strerror(errno)); strerror(errno));
/* become process group leader */ /* become process group leader */
if ((setsid() < 0)) if ((setsid() < 0))
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setsid failed: %s\n", xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
strerror(errno)); strerror(errno));
} }
i = 0; i = 0;
@ -223,8 +223,8 @@ xf86OpenConsole(void)
*/ */
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) if (ret < 0)
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n", xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
strerror(errno)); strerror(errno));
else else
activeVT = vts.v_active; activeVT = vts.v_active;
@ -320,23 +320,23 @@ xf86CloseConsole(void)
/* Back to text mode ... */ /* Back to text mode ... */
SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
if (ret < 0) if (ret < 0)
LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: KDSETMODE failed: %s\n", xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
strerror(errno)); strerror(errno));
SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode)); SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr); tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
if (ret < 0) if (ret < 0)
LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_GETMODE failed: %s\n", xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
strerror(errno)); strerror(errno));
else { else {
/* set dflt vt handling */ /* set dflt vt handling */
VT.mode = VT_AUTO; VT.mode = VT_AUTO;
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
if (ret < 0) if (ret < 0)
LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_SETMODE failed: %s\n", xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
strerror(errno)); strerror(errno));
} }
if (xf86Info.autoVTSwitch) { if (xf86Info.autoVTSwitch) {
@ -347,8 +347,8 @@ xf86CloseConsole(void)
if (activeVT >= 0) { if (activeVT >= 0) {
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) { if (ret < 0) {
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n", xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
strerror(errno)); strerror(errno));
} else { } else {
if (vts.v_active == xf86Info.vtno) { if (vts.v_active == xf86Info.vtno) {
switch_to(activeVT, "xf86CloseConsole"); switch_to(activeVT, "xf86CloseConsole");

6
hw/xfree86/os-support/linux/lnx_kmod.c
View File

@ -72,12 +72,12 @@ xf86LoadKernelModule(const char *modName)
* preinstall agpgart module for some DRM modules * preinstall agpgart module for some DRM modules
*/ */
if (setreuid(0, 0)) { if (setreuid(0, 0)) {
LogMessageVerb(X_WARNING, 1, "LoadKernelModule: " xf86Msg(X_WARNING, "LoadKernelModule: "
"Setting of real/effective user Id to 0/0 failed"); "Setting of real/effective user Id to 0/0 failed");
} }
setenv("PATH", "/sbin", 1); setenv("PATH", "/sbin", 1);
execl(mpPath, "modprobe", modName, NULL); execl(mpPath, "modprobe", modName, NULL);
LogMessageVerb(X_WARNING, 1, "LoadKernelModule %s\n", strerror(errno)); xf86Msg(X_WARNING, "LoadKernelModule %s\n", strerror(errno));
exit(EXIT_FAILURE); /* if we get here the child's exec failed */ exit(EXIT_FAILURE); /* if we get here the child's exec failed */
break; break;
case -1: /* fork failed */ case -1: /* fork failed */

2
hw/xfree86/os-support/shared/drm_platform.c
View File

@ -61,7 +61,7 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
v = drmGetVersion(fd); v = drmGetVersion(fd);
if (!v) { if (!v) {
LogMessageVerb(X_ERROR, 1, "%s: failed to query DRM version\n", path); xf86Msg(X_ERROR, "%s: failed to query DRM version\n", path);
goto out; goto out;
} }

24
hw/xfree86/os-support/shared/posix_tty.c
View File

@ -124,7 +124,7 @@ xf86OpenSerial(XF86OptionPtr options)
dev = xf86SetStrOption(options, "Device", NULL); dev = xf86SetStrOption(options, "Device", NULL);
if (!dev) { if (!dev) {
LogMessageVerb(X_ERROR, 1, "xf86OpenSerial: No Device specified.\n"); xf86Msg(X_ERROR, "xf86OpenSerial: No Device specified.\n");
return -1; return -1;
} }
@ -134,9 +134,9 @@ xf86OpenSerial(XF86OptionPtr options)
SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK)); SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
if (fd == -1) { if (fd == -1) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"xf86OpenSerial: Cannot open device %s\n\t%s.\n", "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
dev, strerror(errno)); dev, strerror(errno));
free(dev); free(dev);
return -1; return -1;
} }
@ -209,7 +209,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
cfsetospeed(&t, baud); cfsetospeed(&t, baud);
} }
else { else {
LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", val); xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", val);
return -1; return -1;
} }
} }
@ -223,7 +223,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CSTOPB; t.c_cflag |= CSTOPB;
break; break;
default: default:
LogMessageVerb(X_ERROR, 1, "Invalid Option StopBits value: %d\n", val); xf86Msg(X_ERROR, "Invalid Option StopBits value: %d\n", val);
return -1; return -1;
break; break;
} }
@ -248,7 +248,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CS8; t.c_cflag |= CS8;
break; break;
default: default:
LogMessageVerb(X_ERROR, 1, "Invalid Option DataBits value: %d\n", val); xf86Msg(X_ERROR, "Invalid Option DataBits value: %d\n", val);
return -1; return -1;
break; break;
} }
@ -266,7 +266,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag &= ~(PARENB); t.c_cflag &= ~(PARENB);
} }
else { else {
LogMessageVerb(X_ERROR, 1, "Invalid Option Parity value: %s\n", s); xf86Msg(X_ERROR, "Invalid Option Parity value: %s\n", s);
free(s); free(s);
return -1; return -1;
} }
@ -295,7 +295,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_iflag &= ~(IXON | IXOFF); t.c_iflag &= ~(IXON | IXOFF);
} }
else { else {
LogMessageVerb(X_ERROR, 1, "Invalid Option FlowControl value: %s\n", s); xf86Msg(X_ERROR, "Invalid Option FlowControl value: %s\n", s);
free(s); free(s);
return -1; return -1;
} }
@ -311,14 +311,14 @@ xf86SetSerial(int fd, XF86OptionPtr options)
SYSCALL(ioctl(fd, TIOCCDTR, NULL)); SYSCALL(ioctl(fd, TIOCCDTR, NULL));
#endif #endif
#else #else
LogMessageVerb(X_WARNING, 1, "Option ClearDTR not supported on this OS\n"); xf86Msg(X_WARNING, "Option ClearDTR not supported on this OS\n");
return -1; return -1;
#endif #endif
xf86MarkOptionUsedByName(options, "ClearDTR"); xf86MarkOptionUsedByName(options, "ClearDTR");
} }
if ((xf86SetBoolOption(options, "ClearRTS", FALSE))) { if ((xf86SetBoolOption(options, "ClearRTS", FALSE))) {
LogMessageVerb(X_WARNING, 1, "Option ClearRTS not supported on this OS\n"); xf86Msg(X_WARNING, "Option ClearRTS not supported on this OS\n");
return -1; return -1;
xf86MarkOptionUsedByName(options, "ClearRTS"); xf86MarkOptionUsedByName(options, "ClearRTS");
} }
@ -347,7 +347,7 @@ xf86SetSerialSpeed(int fd, int speed)
cfsetospeed(&t, baud); cfsetospeed(&t, baud);
} }
else { else {
LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", speed); xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", speed);
return -1; return -1;
} }

18
hw/xfree86/os-support/shared/sigio.c
View File

@ -145,7 +145,7 @@ xf86SIGIO(int sig)
} }
} }
if (r > 0) { if (r > 0) {
LogMessageVerb(X_ERROR, 1, "SIGIO %d descriptors not handled\n", r); xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r);
} }
/* restore global errno */ /* restore global errno */
errno = save_errno; errno = save_errno;
@ -198,13 +198,13 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
block_sigio(); block_sigio();
#ifdef O_ASYNC #ifdef O_ASYNC
if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) { if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
LogMessageVerb(X_WARNING, 1, "fcntl(%d, O_ASYNC): %s\n", xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
if (fcntl(fd, F_SETOWN, getpid()) == -1) { if (fcntl(fd, F_SETOWN, getpid()) == -1) {
LogMessageVerb(X_WARNING, 1, "fcntl(%d, F_SETOWN): %s\n", xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
installed = TRUE; installed = TRUE;
@ -215,8 +215,8 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
/* System V Streams - used on Solaris for input devices */ /* System V Streams - used on Solaris for input devices */
if (!installed && isastream(fd)) { if (!installed && isastream(fd)) {
if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) { if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG): %s\n", xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
else { else {
installed = TRUE; installed = TRUE;
@ -283,8 +283,8 @@ xf86RemoveSIGIOHandler(int fd)
#if defined(I_SETSIG) && defined(HAVE_ISASTREAM) #if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
if (isastream(fd)) { if (isastream(fd)) {
if (ioctl(fd, I_SETSIG, 0) == -1) { if (ioctl(fd, I_SETSIG, 0) == -1) {
LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG, 0): %s\n", xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
fd, strerror(errno)); fd, strerror(errno));
} }
} }
#endif #endif

14
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -116,14 +116,14 @@ sunPMGetEventFromOS(int fd, pmEvent * events, int num)
if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) { if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
LogMessageVerb(X_WARNING, 1, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT" xf86Msg(X_WARNING, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
} }
break; break;
} }
events[i] = sunToXF86(sunEvent.type); events[i] = sunToXF86(sunEvent.type);
} }
LogMessageVerb(X_WARNING, 1, "Got some events\n"); xf86Msg(X_WARNING, "Got some events\n");
return i; return i;
} }
@ -141,11 +141,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_SYS_SUSPEND: case XF86_APM_SYS_SUSPEND:
case XF86_APM_CRITICAL_SUSPEND: case XF86_APM_CRITICAL_SUSPEND:
case XF86_APM_USER_SUSPEND: case XF86_APM_USER_SUSPEND:
LogMessageVerb(X_WARNING, 1, "Got SUSPENDED\n"); xf86Msg(X_WARNING, "Got SUSPENDED\n");
if (ioctl(fd, SRN_IOC_SUSPEND, NULL) == 0) if (ioctl(fd, SRN_IOC_SUSPEND, NULL) == 0)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND" xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }
@ -154,11 +154,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_CRITICAL_RESUME: case XF86_APM_CRITICAL_RESUME:
case XF86_APM_STANDBY_FAILED: case XF86_APM_STANDBY_FAILED:
case XF86_APM_SUSPEND_FAILED: case XF86_APM_SUSPEND_FAILED:
LogMessageVerb(X_WARNING, 1, "Got RESUME\n"); xf86Msg(X_WARNING, "Got RESUME\n");
if (ioctl(fd, SRN_IOC_RESUME, NULL) == 0) if (ioctl(fd, SRN_IOC_RESUME, NULL) == 0)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_RESUME" xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
" %s\n", strerror(errno)); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }

16
hw/xfree86/os-support/solaris/sun_bell.c
View File

@ -71,8 +71,8 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK); audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
if (audioFD == -1) { if (audioFD == -1) {
LogMessageVerb(X_ERROR, 1, "Bell: cannot open audio device \"%s\": %s\n", xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
return; return;
} }
@ -119,9 +119,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100); audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);
if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) { if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n", "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
close(audioFD); close(audioFD);
return; return;
} }
@ -150,9 +150,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
if (written == -1) { if (written == -1) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
LogMessageVerb(X_ERROR, 1, xf86Msg(X_ERROR,
"Bell: writev failed on audio device \"%s\": %s\n", "Bell: writev failed on audio device \"%s\": %s\n",
AUDIO_DEVICE, strerror(errno)); AUDIO_DEVICE, strerror(errno));
close(audioFD); close(audioFD);
return; return;
} }

46
hw/xfree86/os-support/solaris/sun_init.c
View File

@ -77,13 +77,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
if (ret != 0) if (ret != 0)
LogMessageVerb(X_WARNING, 1, "%s: VT_ACTIVATE failed: %s\n", xf86Msg(X_WARNING, "%s: VT_ACTIVATE failed: %s\n",
from, strerror(errno)); from, strerror(errno));
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt)); SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
if (ret != 0) if (ret != 0)
LogMessageVerb(X_WARNING, 1, "%s: VT_WAITACTIVE failed: %s\n", xf86Msg(X_WARNING, "%s: VT_WAITACTIVE failed: %s\n",
from, strerror(errno)); from, strerror(errno));
} }
#endif #endif
@ -146,7 +146,7 @@ xf86OpenConsole(void)
if (vtEnabled == 0) { if (vtEnabled == 0) {
/* VT not enabled - kernel too old or Sparc platforms /* VT not enabled - kernel too old or Sparc platforms
without visual_io support */ without visual_io support */
LogMessageVerb(from, 1, "VT infrastructure is not available\n"); xf86Msg(from, "VT infrastructure is not available\n");
xf86StartVT = 0; xf86StartVT = 0;
xf86Info.vtno = 0; xf86Info.vtno = 0;
@ -174,7 +174,7 @@ xf86OpenConsole(void)
} }
} }
LogMessageVerb(from, 1, "using VT number %d\n\n", xf86Info.vtno); xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno); snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);
if (fd != -1) { if (fd != -1) {
@ -207,8 +207,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */ #ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0) if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0) if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86OpenConsole: VT_SET_CONSUSER failed\n"); "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif #endif
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
@ -225,16 +225,16 @@ xf86OpenConsole(void)
FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n"); FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0) if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_SETDISPINFO failed\n"); xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
} }
#endif #endif
#ifdef KDSETMODE #ifdef KDSETMODE
SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS)); SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
if (i < 0) { if (i < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n", "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
consoleDev, strerror(errno)); consoleDev, strerror(errno));
} }
#endif #endif
} }
@ -251,8 +251,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */ #ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0) if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0) if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86OpenConsole: VT_SET_CONSUSER failed\n"); "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif #endif
/* /*
@ -288,18 +288,18 @@ xf86CloseConsole(void)
* the system, rather than only the console. * the system, rather than only the console.
*/ */
if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) { if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86CloseConsole(): unable to open framebuffer (%s)\n", "xf86CloseConsole(): unable to open framebuffer (%s)\n",
strerror(errno)); strerror(errno));
} }
else { else {
struct fbgattr fbattr; struct fbgattr fbattr;
if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) && if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) { (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86CloseConsole(): unable to retrieve framebuffer" "xf86CloseConsole(): unable to retrieve framebuffer"
" attributes (%s)\n", strerror(errno)); " attributes (%s)\n", strerror(errno));
} }
else { else {
void *fbdata; void *fbdata;
@ -307,9 +307,9 @@ xf86CloseConsole(void)
fbdata = mmap(NULL, fbattr.fbtype.fb_size, fbdata = mmap(NULL, fbattr.fbtype.fb_size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (fbdata == MAP_FAILED) { if (fbdata == MAP_FAILED) {
LogMessageVerb(X_WARNING, 1, xf86Msg(X_WARNING,
"xf86CloseConsole(): unable to mmap framebuffer" "xf86CloseConsole(): unable to mmap framebuffer"
" (%s)\n", strerror(errno)); " (%s)\n", strerror(errno));
} }
else { else {
memset(fbdata, 0, fbattr.fbtype.fb_size); memset(fbdata, 0, fbattr.fbtype.fb_size);

2
hw/xfree86/os-support/solaris/sun_vid.c
View File

@ -92,7 +92,7 @@ xf86EnableIO(void)
{ {
#if defined(__i386__) || defined(__i386) || defined(__x86) #if defined(__i386__) || defined(__i386) || defined(__x86)
if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) { if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
LogMessageVerb(X_WARNING, 1, "xf86EnableIO: Failed to set IOPL for I/O\n"); xf86Msg(X_WARNING, "xf86EnableIO: Failed to set IOPL for I/O\n");
return FALSE; return FALSE;
} }
#endif /* i386 */ #endif /* i386 */