diff --git a/glx/vndext.c b/glx/vndext.c
index 106526913..b424dadb0 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -198,7 +198,7 @@ GLXClientCallback(CallbackListPtr *list, void *closure, void *data)
static void
GLXReset(ExtensionEntry *extEntry)
{
- // LogMessageVerb(X_INFO, 1, "GLX: GLXReset\n");
+ // xf86Msg(X_INFO, "GLX: GLXReset\n");
GlxVendorExtensionReset(extEntry);
GlxDispatchReset();
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index dae11fb9f..653352e4d 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -248,6 +248,12 @@ extern _X_EXPORT void
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
_X_ATTRIBUTE_PRINTF(3, 4);
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, ...)
_X_ATTRIBUTE_PRINTF(2, 3);
extern _X_EXPORT void
@@ -394,8 +400,4 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
extern _X_EXPORT void
xf86UpdateDesktopDimensions(void);
-/* only for backwards (source) compatibility */
-#define xf86MsgVerb LogMessageVerb
-#define xf86Msg(type, ...) LogMessageVerb(type, 1, __VA_ARGS__)
-
#endif /* _XF86_H */
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 5bbf876d9..fc549f34a 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -160,7 +160,7 @@ xf86AddMatchedDriver(XF86MatchedDrivers *md, const char *driver)
md->nmatches++;
}
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 */
}
else {
- LogMessageVerb(X_ERROR, 1, "Couldn't allocate Config record.\n");
+ xf86Msg(X_ERROR, "Couldn't allocate Config record.\n");
return FALSE;
}
@@ -205,14 +205,14 @@ xf86AutoConfig(void)
free(md.matches[i]);
}
- LogMessageVerb(X_DEFAULT, 0,
+ xf86MsgVerb(X_DEFAULT, 0,
"Using default built-in configuration (%d lines)\n",
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++)
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();
xf86setBuiltinConfig(builtinConfig);
@@ -220,7 +220,7 @@ xf86AutoConfig(void)
FreeConfig();
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;
}
@@ -253,12 +253,12 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
}
if (iret < 0) {
- LogMessageVerb(X_WARNING, 1,
- "could not get frame buffer identifier from %s\n",
- xf86SolarisFbDev);
+ xf86Msg(X_WARNING,
+ "could not get frame buffer identifier from %s\n",
+ xf86SolarisFbDev);
}
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 */
if (strcmp(visid.name, "NVDAnvda") == 0) {
@@ -392,7 +392,7 @@ autoConfigDevice(GDevPtr preconf_device)
/* get all possible video drivers and count them */
listPossibleVideoDrivers(&md);
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);
}
@@ -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;
}
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index b5bd7364e..6c3921717 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -99,7 +99,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
}
#endif
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);
foundScreen = (*drv->Probe) (drv, (detect_only) ? PROBE_DETECT
: PROBE_DEFAULT);
@@ -184,7 +184,7 @@ xf86BusConfig(void)
/* If nothing was detected, return now */
if (xf86NumScreens == 0) {
- LogMessageVerb(X_ERROR, 1, "No devices detected.\n");
+ xf86Msg(X_ERROR, "No devices detected.\n");
return FALSE;
}
@@ -208,9 +208,9 @@ xf86BusConfig(void)
xf86Screens[i]->confScreen = layout->screen;
else {
/* No match found */
- LogMessageVerb(X_ERROR, 1,
- "Screen %d deleted because of no matching config section.\n",
- i);
+ xf86Msg(X_ERROR,
+ "Screen %d deleted because of no matching config section.\n",
+ i);
xf86DeleteScreen(xf86Screens[i--]);
}
}
@@ -224,8 +224,8 @@ xf86BusConfig(void)
/* If no screens left, return now. */
if (xf86NumScreens == 0) {
- LogMessageVerb(X_ERROR, 1,
- "Device(s) detected, but none match those in the config file.\n");
+ xf86Msg(X_ERROR,
+ "Device(s) detected, but none match those in the config file.\n");
return FALSE;
}
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index ba5ab72d5..b042d2a60 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -196,8 +196,8 @@ xf86ValidateFontPath(char *path)
if (!S_ISDIR(stat_buf.st_mode))
flag = -1;
if (flag != 0) {
- LogMessageVerb(X_WARNING, 1, "The directory \"%s\" does not exist.\n",
- dir_elem);
+ xf86Msg(X_WARNING, "The directory \"%s\" does not exist.\n",
+ dir_elem);
xf86ErrorF("\tEntry deleted from font path.\n");
free(dir_elem);
continue;
@@ -210,9 +210,9 @@ xf86ValidateFontPath(char *path)
flag = -1;
free(p1);
if (flag != 0) {
- LogMessageVerb(X_WARNING, 1,
- "`fonts.dir' not found (or not valid) in \"%s\".\n",
- dir_elem);
+ xf86Msg(X_WARNING,
+ "`fonts.dir' not found (or not valid) in \"%s\".\n",
+ dir_elem);
xf86ErrorF("\tEntry deleted from font path.\n");
xf86ErrorF("\t(Run 'mkfontdir' on \"%s\").\n", dir_elem);
free(dir_elem);
@@ -270,7 +270,7 @@ xf86ModulelistFromConfig(void ***optlist)
* ModulePath
*/
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;
}
@@ -280,9 +280,9 @@ xf86ModulelistFromConfig(void ***optlist)
*/
modp = xf86configptr->conf_modules->mod_disable_lst;
while (modp) {
- LogMessageVerb(X_WARNING, 1,
- "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n",
- modp->load_name);
+ xf86Msg(X_WARNING,
+ "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n",
+ modp->load_name);
modp = (XF86LoadPtr) modp->list.next;
}
/*
@@ -293,18 +293,18 @@ xf86ModulelistFromConfig(void ***optlist)
*/
for (i = 0; ModuleDefaults[i].name != NULL; i++) {
if (ModuleDefaults[i].toLoad == FALSE) {
- LogMessageVerb(X_WARNING, 1,
- "\"%s\" is not to be loaded by default. Skipping.\n",
- ModuleDefaults[i].name);
+ xf86Msg(X_WARNING,
+ "\"%s\" is not to be loaded by default. Skipping.\n",
+ ModuleDefaults[i].name);
continue;
}
found = FALSE;
modp = xf86configptr->conf_modules->mod_load_lst;
while (modp) {
if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
- LogMessageVerb(X_INFO, 1,
- "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n",
- ModuleDefaults[i].name);
+ xf86Msg(X_INFO,
+ "\"%s\" will be loaded. This was enabled by default and also specified in the config file.\n",
+ ModuleDefaults[i].name);
found = TRUE;
break;
}
@@ -314,9 +314,9 @@ xf86ModulelistFromConfig(void ***optlist)
modp = xf86configptr->conf_modules->mod_disable_lst;
while (modp) {
if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
- LogMessageVerb(X_INFO, 1,
- "\"%s\" will be loaded even though the default is to disable it.\n",
- ModuleDefaults[i].name);
+ xf86Msg(X_INFO,
+ "\"%s\" will be loaded even though the default is to disable it.\n",
+ ModuleDefaults[i].name);
found = TRUE;
break;
}
@@ -329,8 +329,8 @@ xf86ModulelistFromConfig(void ***optlist)
xf86addNewLoadDirective(ptr, ModuleDefaults[i].name,
XF86_LOAD_MODULE,
ModuleDefaults[i].load_opt);
- LogMessageVerb(X_INFO, 1, "\"%s\" will be loaded by default.\n",
- ModuleDefaults[i].name);
+ xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n",
+ ModuleDefaults[i].name);
}
}
}
@@ -402,7 +402,7 @@ xf86DriverlistFromConfig(void)
* ModulePath
*/
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;
}
@@ -479,7 +479,7 @@ xf86InputDriverlistFromConfig(void)
* ModulePath
*/
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;
}
@@ -583,7 +583,7 @@ configFiles(XF86ConfFilesPtr fileconf)
/* copy last entry */
*(temp_path++) = '\t';
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);
/* 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) {
XkbBaseDirectory = fileconf->file_xkbdir;
- LogMessageVerb(X_CONFIG, 1, "XKB base directory set to \"%s\"\n",
- XkbBaseDirectory);
+ xf86Msg(X_CONFIG, "XKB base directory set to \"%s\"\n",
+ XkbBaseDirectory);
}
#if 0
/* LogFile */
@@ -750,12 +750,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &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);
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)) {
@@ -766,8 +766,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else {
from = X_DEFAULT;
}
- LogMessageVerb(from, 1, "%sutomatically adding devices\n",
- xf86Info.autoAddDevices ? "A" : "Not a");
+ xf86Msg(from, "%sutomatically adding devices\n",
+ xf86Info.autoAddDevices ? "A" : "Not a");
if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ENABLE_DEVICES)) {
xf86GetOptValBool(FlagOptions, FLAG_AUTO_ENABLE_DEVICES,
@@ -777,8 +777,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else {
from = X_DEFAULT;
}
- LogMessageVerb(from, 1, "%sutomatically enabling devices\n",
- xf86Info.autoEnableDevices ? "A" : "Not a");
+ xf86Msg(from, "%sutomatically enabling devices\n",
+ xf86Info.autoEnableDevices ? "A" : "Not a");
if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_GPU)) {
xf86GetOptValBool(FlagOptions, FLAG_AUTO_ADD_GPU,
@@ -788,8 +788,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else {
from = X_DEFAULT;
}
- LogMessageVerb(from, 1, "%sutomatically adding GPU devices\n",
- xf86Info.autoAddGPU ? "A" : "Not a");
+ xf86Msg(from, "%sutomatically adding GPU devices\n",
+ xf86Info.autoAddGPU ? "A" : "Not a");
if (xf86AutoBindGPUDisabled) {
xf86Info.autoBindGPU = FALSE;
@@ -803,8 +803,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
else {
from = X_DEFAULT;
}
- LogMessageVerb(from, 1, "%sutomatically binding GPU devices\n",
- xf86Info.autoBindGPU ? "A" : "Not a");
+ xf86Msg(from, "%sutomatically binding GPU devices\n",
+ xf86Info.autoBindGPU ? "A" : "Not a");
/*
* 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 (!xf86NameCmp(s, "flush")) {
- LogMessageVerb(X_CONFIG, 1, "Flushing logfile enabled\n");
+ xf86Msg(X_CONFIG, "Flushing logfile enabled\n");
LogSetParameter(XLOG_FLUSH, TRUE);
}
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_SYNC, TRUE);
}
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);
if (policy == PictureCmapPolicyInvalid)
- LogMessageVerb(X_WARNING, 1, "Unknown colormap policy \"%s\"\n", s);
+ xf86Msg(X_WARNING, "Unknown colormap policy \"%s\"\n", s);
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;
}
}
@@ -868,7 +868,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.glxVisuals = XF86_GlxVisualsAll;
}
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;
}
if (!noPanoramiXExtension)
- LogMessageVerb(from, 1, "Xinerama: enabled\n");
+ xf86Msg(from, "Xinerama: enabled\n");
#endif /* XINERAMA */
#ifdef DRI2
@@ -973,7 +973,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
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);
}
@@ -1082,7 +1082,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
confInput = xf86findInput(xf86PointerName,
xf86configptr->conf_input_lst);
if (!confInput) {
- LogMessageVerb(X_ERROR, 1, "No InputDevice section called \"%s\"\n",
+ xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
xf86PointerName);
return FALSE;
}
@@ -1169,7 +1169,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
if (!foundPointer && xf86Info.forceInputDevices) {
/* 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);
return FALSE;
}
@@ -1181,7 +1181,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
confInput = xf86findInput(xf86KeyboardName,
xf86configptr->conf_input_lst);
if (!confInput) {
- LogMessageVerb(X_ERROR, 1, "No InputDevice section called \"%s\"\n",
+ xf86Msg(X_ERROR, "No InputDevice section called \"%s\"\n",
xf86KeyboardName);
return FALSE;
}
@@ -1265,27 +1265,27 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
if (!foundKeyboard && xf86Info.forceInputDevices) {
/* 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);
return FALSE;
}
if (pointerMsg) {
if (implicitLayout)
- LogMessageVerb(X_DEFAULT, 1, "No Layout section. Using the %s.\n",
+ xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
pointerMsg);
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"
"\tUsing the %s.\n", pointerMsg);
}
if (keyboardMsg) {
if (implicitLayout)
- LogMessageVerb(X_DEFAULT, 1, "No Layout section. Using the %s.\n",
+ xf86Msg(X_DEFAULT, "No Layout section. Using the %s.\n",
keyboardMsg);
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"
"\tUsing the %s.\n", keyboardMsg);
}
@@ -1301,15 +1301,15 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
#else
config_backend = "wscons";
#endif
- LogMessageVerb(X_INFO, 1, "The server relies on %s to provide the list of "
- "input devices.\n\tIf no devices become available, "
- "reconfigure %s or disable AutoAddDevices.\n",
- config_backend, config_backend);
+ xf86Msg(X_INFO, "The server relies on %s to provide the list of "
+ "input devices.\n\tIf no devices become available, "
+ "reconfigure %s or disable AutoAddDevices.\n",
+ config_backend, config_backend);
#else
- LogMessageVerb(X_WARNING, 1, "Hotplugging requested but the server was "
- "compiled without a config backend. "
- "No input devices were configured, the server "
- "will start without any input devices.\n");
+ xf86Msg(X_WARNING, "Hotplugging requested but the server was "
+ "compiled without a config backend. "
+ "No input devices were configured, the server "
+ "will start without any input devices.\n");
#endif
}
@@ -1406,13 +1406,13 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
}
if (xf86LayoutName != NULL) {
if ((l = xf86findLayout(xf86LayoutName, conf_layout)) == NULL) {
- LogMessageVerb(X_ERROR, 1, "No ServerLayout section called \"%s\"\n",
- xf86LayoutName);
+ xf86Msg(X_ERROR, "No ServerLayout section called \"%s\"\n",
+ xf86LayoutName);
return FALSE;
}
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;
/*
@@ -1532,8 +1532,8 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
}
if (slp[i].where != PosObsolete
&& slp[i].where != PosAbsolute && !slp[i].refscreen) {
- LogMessageVerb(X_ERROR, 1, "Screen %s doesn't exist: deleting placement\n",
- slp[i].refname);
+ xf86Msg(X_ERROR, "Screen %s doesn't exist: deleting placement\n",
+ slp[i].refname);
slp[i].where = PosAbsolute;
slp[i].x = 0;
slp[i].y = 0;
@@ -1613,8 +1613,8 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
from = X_CONFIG;
if (xf86ScreenName != NULL) {
if ((s = xf86findScreen(xf86ScreenName, conf_screen)) == NULL) {
- LogMessageVerb(X_ERROR, 1, "No Screen section called \"%s\"\n",
- xf86ScreenName);
+ xf86Msg(X_ERROR, "No Screen section called \"%s\"\n",
+ xf86ScreenName);
return FALSE;
}
conf_screen = s;
@@ -1658,12 +1658,12 @@ configXvAdaptor(confXvAdaptorPtr adaptor, XF86ConfVideoAdaptorPtr conf_adaptor)
int count = 0;
XF86ConfVideoPortPtr conf_port;
- LogMessageVerb(X_CONFIG, 1, "| |-->VideoAdaptor \"%s\"\n",
- conf_adaptor->va_identifier);
+ xf86Msg(X_CONFIG, "| |-->VideoAdaptor \"%s\"\n",
+ conf_adaptor->va_identifier);
adaptor->identifier = conf_adaptor->va_identifier;
adaptor->options = conf_adaptor->va_option_lst;
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;
}
@@ -1704,11 +1704,11 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
memset(&local_conf_screen, 0, sizeof(local_conf_screen));
conf_screen = &local_conf_screen;
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,
- scrnum);
+ xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
+ scrnum);
/*
* 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));
if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) {
FIND_SUITABLE (XF86ConfDevicePtr, xf86configptr->conf_device_lst, conf_screen->scrn_device);
- LogMessageVerb(X_DEFAULT, 1, "No device specified for screen \"%s\".\n"
- "\tUsing the first device section listed.\n", screenp->id);
+ xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
+ "\tUsing the first device section listed.\n", screenp->id);
}
if (configDevice(screenp->device, conf_screen->scrn_device, TRUE, FALSE)) {
screenp->device->myScreenSection = screenp;
@@ -1846,8 +1846,8 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
}
if (defaultMonitor) {
- LogMessageVerb(X_DEFAULT, 1, "No monitor specified for screen \"%s\".\n"
- "\tUsing a default monitor configuration.\n", screenp->id);
+ xf86Msg(X_DEFAULT, "No monitor specified for screen \"%s\".\n"
+ "\tUsing a default monitor configuration.\n", screenp->id);
}
return TRUE;
}
@@ -1878,7 +1878,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
float badgamma = 0.0;
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->vendor = conf_monitor->mon_vendor;
monitorp->model = conf_monitor->mon_modelname;
@@ -2098,14 +2098,14 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active, Bool g
if (active) {
if (gpu)
- LogMessageVerb(X_CONFIG, 1, "| |-->GPUDevice \"%s\"\n",
- conf_device->dev_identifier);
+ xf86Msg(X_CONFIG, "| |-->GPUDevice \"%s\"\n",
+ conf_device->dev_identifier);
else
- LogMessageVerb(X_CONFIG, 1, "| |-->Device \"%s\"\n",
- conf_device->dev_identifier);
+ xf86Msg(X_CONFIG, "| |-->Device \"%s\"\n",
+ conf_device->dev_identifier);
} else
- LogMessageVerb(X_CONFIG, 1, "|-->Inactive Device \"%s\"\n",
- conf_device->dev_identifier);
+ xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n",
+ conf_device->dev_identifier);
devicep->identifier = conf_device->dev_identifier;
devicep->vendor = conf_device->dev_vendor;
@@ -2199,17 +2199,17 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
enable = !enable;
}
else {
- LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized value \"%s\"\n", val);
+ xf86Msg(X_WARNING, "Ignoring unrecognized value \"%s\"\n", val);
free(n);
continue;
}
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");
}
else {
- LogMessageVerb(X_WARNING, 1, "Ignoring unrecognized extension \"%s\"\n",
+ xf86Msg(X_WARNING, "Ignoring unrecognized extension \"%s\"\n",
name);
}
free(n);
@@ -2220,7 +2220,7 @@ configExtensions(XF86ConfExtensionsPtr conf_ext)
static Bool
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->driver = conf_input->inp_driver;
inputp->options = conf_input->inp_option_lst;
@@ -2286,12 +2286,12 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout)
InputInfoPtr *current;
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");
warned = TRUE;
}
- LogMessageVerb(X_WARNING, 1, "Disabling %s\n", (*dev)->name);
+ xf86Msg(X_WARNING, "Disabling %s\n", (*dev)->name);
current = dev;
free(*dev);
@@ -2347,27 +2347,27 @@ xf86HandleConfigFile(Bool autoconfig)
dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
if (filename) {
- LogMessageVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
+ xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
xf86ConfigFile = XNFstrdup(filename);
}
else {
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);
}
if (dirname) {
- LogMessageVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
+ xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
dirname);
xf86ConfigDir = XNFstrdup(dirname);
}
else {
if (xf86ConfigDir)
- LogMessageVerb(X_ERROR, 1,
- "Unable to locate/open config directory: \"%s\"\n",
- xf86ConfigDir);
+ xf86Msg(X_ERROR,
+ "Unable to locate/open config directory: \"%s\"\n",
+ xf86ConfigDir);
}
if (sysdirname)
- LogMessageVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
+ xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
sysdirname);
if (!filename && !dirname && !sysdirname)
return CONFIG_NOFILE;
@@ -2378,7 +2378,7 @@ xf86HandleConfigFile(Bool autoconfig)
}
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;
}
xf86closeConfigFile();
@@ -2400,14 +2400,14 @@ xf86HandleConfigFile(Bool autoconfig)
XF86ConfScreenPtr screen;
if (xf86ScreenName == NULL) {
- LogMessageVerb(X_DEFAULT, 1,
- "No Layout section. Using the first Screen section.\n");
+ xf86Msg(X_DEFAULT,
+ "No Layout section. Using the first Screen section.\n");
}
FIND_SUITABLE (XF86ConfScreenPtr, xf86configptr->conf_screen_lst, screen);
if (!configImpliedLayout(&xf86ConfigLayout,
screen,
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;
}
implicit_layout = TRUE;
@@ -2421,13 +2421,13 @@ xf86HandleConfigFile(Bool autoconfig)
dfltlayout =
xf86SetStrOption(optlist, "defaultserverlayout", NULL);
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;
}
}
else {
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;
}
}
@@ -2445,8 +2445,8 @@ xf86HandleConfigFile(Bool autoconfig)
}
if (scanptr) {
if (strncmp(scanptr, "PCI:", 4) != 0) {
- LogMessageVerb(X_WARNING, 1, "Bus types other than PCI not yet isolable.\n"
- "\tIgnoring IsolateDevice option.\n");
+ xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
+ "\tIgnoring IsolateDevice option.\n");
}
else
xf86PciIsolateDevice(scanptr);
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 74936a5bd..a9c6a9271 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -696,8 +696,8 @@ DoConfigure(void)
home, addslash);
if (xf86writeConfigFile(filename, xf86config) == 0) {
- LogMessageVerb(X_ERROR, 1, "Unable to write config file: \"%s\": %s\n",
- filename, strerror(errno));
+ xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+ filename, strerror(errno));
goto bail;
}
@@ -802,8 +802,8 @@ DoConfigure(void)
}
if (xf86writeConfigFile(filename, xf86config) == 0) {
- LogMessageVerb(X_ERROR, 1, "Unable to write config file: \"%s\": %s\n",
- filename, strerror(errno));
+ xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+ filename, strerror(errno));
goto bail;
}
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 025e175fa..8a3b5c778 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -588,9 +588,9 @@ xf86InitOrigins(void)
if (screen->refscreen != NULL &&
screen->refscreen->screennum >= xf86NumScreens) {
screensLeft &= ~(1 << i);
- LogMessageVerb(X_WARNING, 1,
- "Not including screen \"%s\" in origins calculation.\n",
- screen->screen->id);
+ xf86Msg(X_WARNING,
+ "Not including screen \"%s\" in origins calculation.\n",
+ screen->screen->id);
continue;
}
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index df22027f4..6d275267d 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -163,7 +163,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
switch (action) {
case ACTION_TERMINATE:
if (!xf86Info.dontZap) {
- LogMessageVerb(X_INFO, 1, "Server zapped. Shutting down.\n");
+ xf86Msg(X_INFO, "Server zapped. Shutting down.\n");
GiveUp(0);
}
break;
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index cbebd5461..3fd272082 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -638,7 +638,7 @@ void
xf86PrintDepthBpp(ScrnInfoPtr scrp)
{
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);
}
+/* 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 */
void
xf86ErrorFVerb(int verb, const char *format, ...)
@@ -1244,7 +1266,7 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
int len, i;
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++) {
if (i != 0) {
xf86ErrorF(",");
@@ -1698,7 +1720,7 @@ xf86IsUnblank(int mode)
case SCREEN_SAVER_CYCLE:
return FALSE;
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;
}
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2f85c7941..b2dd37510 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -309,7 +309,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
t = time(NULL);
ct = ctime(&t);
- LogMessageVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
+ xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
xf86LogFile, ct);
}
@@ -319,7 +319,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
case CONFIG_OK:
break;
case CONFIG_PARSE_ERROR:
- LogMessageVerb(X_ERROR, 1, "Error parsing the config file\n");
+ xf86Msg(X_ERROR, "Error parsing the config file\n");
return;
case CONFIG_NOFILE:
autoconfig = TRUE;
@@ -351,7 +351,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (autoconfig) {
if (!xf86AutoConfig()) {
- LogMessageVerb(X_ERROR, 1, "Auto configuration failed\n");
+ xf86Msg(X_ERROR, "Auto configuration failed\n");
return;
}
}
@@ -374,7 +374,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
configured_device = xf86ConfigLayout.screens->screen->device;
if ((!configured_device) || (!configured_device->driver)) {
if (!autoConfigDevice(configured_device)) {
- LogMessageVerb(X_ERROR, 1, "Automatic driver configuration failed\n");
+ xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
return;
}
}
@@ -404,7 +404,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
*/
if (xf86NumDrivers == 0) {
- LogMessageVerb(X_ERROR, 1, "No drivers available.\n");
+ xf86Msg(X_ERROR, "No drivers available.\n");
return;
}
@@ -502,8 +502,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
*/
if (xf86NumScreens == 0) {
- LogMessageVerb(X_ERROR, 1,
- "Screen(s) found, but none have a usable configuration.\n");
+ xf86Msg(X_ERROR,
+ "Screen(s) found, but none have a usable configuration.\n");
return;
}
@@ -580,7 +580,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (xf86OSPMClose)
xf86OSPMClose();
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 */
if (xorgHWAccess)
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index 1d7495fb3..427e9e0aa 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -208,7 +208,7 @@ xf86HandlePMEvents(int fd, void *data)
const char *str = NULL;
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);
switch (xf86PMConfirmEventToOs(fd, events[i])) {
case PM_WAIT:
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 47c561b26..55487b48b 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -71,8 +71,8 @@ xf86VGAarbiterInit(void)
{
if (pci_device_vgaarb_init() != 0) {
vga_no_arb = 1;
- LogMessageVerb(X_WARNING, 1,
- "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
+ xf86Msg(X_WARNING,
+ "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
}
}
@@ -167,9 +167,8 @@ xf86VGAarbiterWrapFunctions(void)
if (vga_count < 2 || !xf86Screens)
return FALSE;
- LogMessageVerb(X_INFO, 1,
- "Found %d VGA devices: arbiter wrapping enabled\n",
- vga_count);
+ xf86Msg(X_INFO, "Found %d VGA devices: arbiter wrapping enabled\n",
+ vga_count);
for (i = 0; i < xf86NumScreens; i++) {
pScreen = xf86Screens[i]->pScreen;
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 5c7ea7c23..c2bf01968 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -110,12 +110,12 @@
#include "xkbsrv.h"
/* Valuator verification macro */
-#define XI_VERIFY_VALUATORS(num_valuators) \
- if (num_valuators > MAX_VALUATORS) { \
- LogMessageVerb(X_ERROR, 1, "%s: num_valuator %d is greater than MAX_VALUATORS\n", \
- __FUNCTION__, num_valuators); \
- return; \
- }
+#define XI_VERIFY_VALUATORS(num_valuators) \
+ if (num_valuators > MAX_VALUATORS) { \
+ xf86Msg(X_ERROR, "%s: num_valuator %d is greater than" \
+ " MAX_VALUATORS\n", __FUNCTION__, num_valuators); \
+ return; \
+ }
static int
xf86InputDevicePostInit(DeviceIntPtr dev);
@@ -149,8 +149,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
/* common settings (available via device properties) */
tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);
if (tempf != 1.0) {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) constant deceleration by %.1f\n",
- devname, tempf);
+ xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",
+ devname, tempf);
prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);
XIChangeDeviceProperty(pDev, prop, float_prop, 32,
PropModeReplace, 1, &tempf, FALSE);
@@ -158,8 +158,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);
if (tempf > 1.0) {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) adaptive deceleration by %.1f\n",
- devname, tempf);
+ xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",
+ devname, tempf);
prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);
XIChangeDeviceProperty(pDev, prop, float_prop, 32,
PropModeReplace, 1, &tempf, FALSE);
@@ -172,11 +172,12 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);
if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,
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 {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration profile %i is unknown\n",
- devname, tempi);
+ xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
+ devname, tempi);
}
/* set scaling */
@@ -204,8 +205,8 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);
if (tempf >= 0) {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) max rel. velocity difference: %.1f%%\n",
- devname, tempf * 100.0);
+ xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
+ devname, tempf * 100.0);
s->max_rel_diff = tempf;
}
@@ -251,18 +252,18 @@ ApplyAccelerationSettings(DeviceIntPtr dev)
}
if (InitPointerAccelerationScheme(dev, scheme)) {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) selected scheme %s/%i\n",
- pInfo->name, schemeStr, scheme);
+ xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
+ pInfo->name, schemeStr, scheme);
}
else {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) could not init scheme %s\n",
- pInfo->name, schemeStr);
+ xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
+ pInfo->name, schemeStr);
scheme = dev->valuator->accelScheme.number;
}
}
else {
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) keeping acceleration scheme %i\n",
- pInfo->name, scheme);
+ xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",
+ pInfo->name, scheme);
}
free(schemeStr);
@@ -291,11 +292,11 @@ ApplyAccelerationSettings(DeviceIntPtr dev)
if (i >= 0)
dev->ptrfeed->ctrl.threshold = i;
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration factor: %.3f\n",
- pInfo->name, ((float) dev->ptrfeed->ctrl.num) /
- ((float) dev->ptrfeed->ctrl.den));
- LogMessageVerb(X_CONFIG, 1, "%s: (accel) acceleration threshold: %i\n",
- pInfo->name, dev->ptrfeed->ctrl.threshold);
+ xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
+ pInfo->name, ((float) dev->ptrfeed->ctrl.num) /
+ ((float) dev->ptrfeed->ctrl.den));
+ xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
+ pInfo->name, dev->ptrfeed->ctrl.threshold);
}
}
@@ -318,9 +319,9 @@ ApplyTransformationMatrix(DeviceIntPtr dev)
&matrix[2], &matrix[3], &matrix[4], &matrix[5], &matrix[6],
&matrix[7], &matrix[8]);
if (rc != 9) {
- LogMessageVerb(X_ERROR,1,
- "%s: invalid format for transformation matrix. Ignoring configuration.\n",
- pInfo->name);
+ xf86Msg(X_ERROR,
+ "%s: invalid format for transformation matrix. Ignoring configuration.\n",
+ pInfo->name);
return;
}
@@ -347,11 +348,11 @@ ApplyAutoRepeat(DeviceIntPtr dev)
return;
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;
}
- 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_interval = 1000 / rate;
}
@@ -372,11 +373,11 @@ xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr list)
!xf86SetBoolOption(list, "SendCoreEvents", 1) ||
!xf86SetBoolOption(list, "CorePointer", 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 {
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);
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;
return NULL;
}
@@ -415,9 +416,9 @@ xf86ActivateDevice(InputInfoPtr pInfo)
dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);
if (serverGeneration == 1)
- LogMessageVerb(X_INFO, 1,
- "XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n",
- pInfo->name, pInfo->type_name, dev->id);
+ xf86Msg(X_INFO,
+ "XINPUT: Adding extended input device \"%s\" (type: %s, id %d)\n",
+ pInfo->name, pInfo->type_name, dev->id);
return dev;
}
@@ -724,16 +725,16 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs)
free((void *) idev->driver);
idev->driver = Xstrdup(cl->driver);
if (!idev->driver) {
- LogMessageVerb(X_ERROR, 1, "Failed to allocate memory while merging "
- "InputClass configuration");
+ xf86Msg(X_ERROR, "Failed to allocate memory while merging "
+ "InputClass configuration");
return BadAlloc;
}
classopts = xf86ReplaceStrOption(classopts, "driver", idev->driver);
}
/* Apply options to device with InputClass settings preferred. */
- LogMessageVerb(X_CONFIG, 1, "%s: Applying InputClass \"%s\"\n",
- idev->name, cl->identifier);
+ xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",
+ idev->name, cl->identifier);
idev->options = xf86optionListMerge(idev->options, classopts);
}
@@ -761,8 +762,8 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes * attrs)
}
if (ignore)
- LogMessageVerb(X_CONFIG, 1, "%s: Ignoring device from InputClass \"%s\"\n",
- idev->name, ignore_class);
+ xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",
+ idev->name, ignore_class);
return ignore;
}
@@ -914,10 +915,10 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
drv = xf86LoadInputDriver(pInfo->driver);
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) {
- LogMessageVerb(X_INFO, 1, "Falling back to input driver `%s'\n",
+ xf86Msg(X_INFO, "Falling back to input driver `%s'\n",
FALLBACK_INPUT_DRIVER);
drv = xf86LoadInputDriver(FALLBACK_INPUT_DRIVER);
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);
if (!drv->PreInit) {
- LogMessageVerb(X_ERROR, 1,
- "Input driver `%s' has no PreInit function (ignoring)\n",
- drv->driverName);
+ xf86Msg(X_ERROR,
+ "Input driver `%s' has no PreInit function (ignoring)\n",
+ drv->driverName);
rval = BadImplementation;
goto unwind;
}
@@ -975,7 +976,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
input_unlock();
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;
}
@@ -986,14 +987,14 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
rval = ActivateDevice(dev, TRUE);
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);
goto unwind;
}
rval = xf86InputDevicePostInit(dev);
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);
goto unwind;
}
@@ -1003,7 +1004,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
input_lock();
EnableDevice(dev, TRUE);
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);
rval = BadMatch;
input_unlock();
@@ -1108,14 +1109,15 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
}
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;
goto unwind;
}
if (!pInfo->driver) {
- LogMessageVerb(X_INFO, 1, "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, "No input driver specified, ignoring this device.\n");
+ xf86Msg(X_INFO,
+ "This device may have been added with another device file.\n");
rval = BadRequest;
goto unwind;
}
@@ -1128,7 +1130,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
unwind:
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);
return rval;
}
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 35fb8b0a9..3a9ace9ab 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -133,8 +133,8 @@ xf86PciProbe(void)
primaryBus.id.pci = info;
}
else {
- LogMessageVerb(X_NOTICE, 1,
- "More than one possible primary device found\n");
+ xf86Msg(X_NOTICE,
+ "More than one possible primary device found\n");
primaryBus.type ^= (BusType) (-1);
}
}
@@ -154,10 +154,10 @@ xf86PciProbe(void)
if (xf86IsPrimaryPci(info))
prim = "*";
- LogMessageVerb(X_PROBED, 1, "PCI:%s(%u@%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
- info->bus, info->domain, info->dev, info->func,
- info->vendor_id, info->device_id,
- info->subvendor_id, info->subdevice_id);
+ xf86Msg(X_PROBED, "PCI:%s(%u@%u:%u:%u) %04x:%04x:%04x:%04x ", prim,
+ info->bus, info->domain, info->dev, info->func,
+ info->vendor_id, info->device_id,
+ info->subvendor_id, info->subdevice_id);
xf86ErrorF("rev %d", info->revision);
@@ -825,11 +825,11 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
devList[j]->screen == instances[i].screen) {
if (devBus)
- LogMessageVerb(X_WARNING, 0,
- "%s: More than one matching Device section for "
- "instances\n\t(BusID: %s) found: %s\n",
- driverName, devList[j]->busID,
- devList[j]->identifier);
+ xf86MsgVerb(X_WARNING, 0,
+ "%s: More than one matching Device section for "
+ "instances\n\t(BusID: %s) found: %s\n",
+ driverName, devList[j]->busID,
+ devList[j]->identifier);
else
devBus = devList[j];
}
@@ -840,12 +840,13 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
* only assign to it to the primary device.
*/
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)
- LogMessageVerb(X_WARNING, 0,
- "%s: More than one matching Device section "
- "found: %s\n", driverName,
- devList[j]->identifier);
+ xf86MsgVerb(X_WARNING, 0,
+ "%s: More than one matching Device section "
+ "found: %s\n", driverName,
+ devList[j]->identifier);
else
dev = devList[j];
}
@@ -855,10 +856,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
dev = devBus; /* busID preferred */
if (!dev) {
if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
- LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
- "for instance (BusID PCI:%u@%u:%u:%u) found\n",
- driverName, pPci->bus, pPci->domain, pPci->dev,
- pPci->func);
+ xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+ "for instance (BusID PCI:%u@%u:%u:%u) found\n",
+ driverName, pPci->bus, pPci->domain, pPci->dev,
+ pPci->func);
}
}
else {
@@ -887,10 +888,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (c->token == -1) {
instances[i].claimed = FALSE;
numClaimedInstances--;
- LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
- "section \"%s\" isn't valid for this driver\n",
- driverName, instances[i].dev->chipset,
- instances[i].dev->identifier);
+ xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
+ "section \"%s\" isn't valid for this driver\n",
+ driverName, instances[i].dev->chipset,
+ instances[i].dev->identifier);
}
else {
instances[i].chip = c->token;
@@ -900,17 +901,17 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
break;
}
if (id->numChipset >= 0) {
- LogMessageVerb(X_CONFIG, 1, "Chipset override: %s\n",
- instances[i].dev->chipset);
+ xf86Msg(X_CONFIG, "Chipset override: %s\n",
+ instances[i].dev->chipset);
from = X_CONFIG;
}
else {
instances[i].claimed = FALSE;
numClaimedInstances--;
- LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
- "section \"%s\" isn't a valid PCI chipset\n",
- driverName, instances[i].dev->chipset,
- instances[i].dev->identifier);
+ xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
+ "section \"%s\" isn't a valid PCI chipset\n",
+ driverName, instances[i].dev->chipset,
+ instances[i].dev->identifier);
}
}
}
@@ -922,15 +923,16 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (id->numChipset == -1) {
instances[i].claimed = FALSE;
numClaimedInstances--;
- LogMessageVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
- "section \"%s\" isn't valid for this driver\n",
- driverName, instances[i].dev->chipID,
- instances[i].dev->identifier);
+ xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
+ "section \"%s\" isn't valid for this driver\n",
+ driverName, instances[i].dev->chipID,
+ instances[i].dev->identifier);
}
else {
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;
}
}
@@ -947,7 +949,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (c->token == instances[i].chip)
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)
return;
- LogMessageVerb(X_INFO, 1,
- "Scanning %s directory for additional PCI ID's supported by the drivers\n",
- PCI_TXT_IDS_PATH);
+ xf86Msg(X_INFO,
+ "Scanning %s directory for additional PCI ID's supported by the drivers\n",
+ PCI_TXT_IDS_PATH);
direntry = readdir(idsdir);
/* Read the directory */
while (direntry) {
@@ -1326,8 +1328,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
PCI_TXT_IDS_PATH, direntry->d_name);
fp = fopen(path_name, "r");
if (fp == NULL) {
- LogMessageVerb(X_ERROR, 1, "Could not open %s for reading. Exiting.\n",
- path_name);
+ xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n",
+ path_name);
goto end;
}
/* Read the file */
@@ -1361,8 +1363,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
(char *) malloc(sizeof(char) *
strlen(direntry->d_name) - 3);
if (!tmpMatch) {
- LogMessageVerb(X_ERROR, 1,
- "Could not allocate space for the module name. Exiting.\n");
+ xf86Msg(X_ERROR,
+ "Could not allocate space for the module name. Exiting.\n");
goto end;
}
/* hack off the .ids suffix. This should guard
@@ -1378,8 +1380,8 @@ xf86MatchDriverFromFiles(uint16_t match_vendor, uint16_t match_chip,
}
}
xf86AddMatchedDriver(md, tmpMatch);
- LogMessageVerb(X_INFO, 1, "Matched %s from file name %s\n",
- tmpMatch, direntry->d_name);
+ xf86Msg(X_INFO, "Matched %s from file name %s\n",
+ tmpMatch, direntry->d_name);
free(tmpMatch);
}
}
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index dbae465fc..2962c8b21 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -233,9 +233,9 @@ xf86OutputClassDriverList(int index, XF86MatchedDrivers *md)
if (OutputClassMatches(cl, &xf86_platform_devices[index])) {
char *path = xf86_platform_odev_attributes(index)->path;
- LogMessageVerb(X_INFO, 1, "Applying OutputClass \"%s\" to %s\n",
- cl->identifier, path);
- LogMessageVerb(X_NONE, 1, "\tloading driver: %s\n", cl->driver);
+ xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n",
+ cl->identifier, path);
+ xf86Msg(X_NONE, "\tloading driver: %s\n", cl->driver);
xf86AddMatchedDriver(md, cl->driver);
}
@@ -283,7 +283,7 @@ void xf86PlatformScanPciDev(void)
if (!xf86scanpci())
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++) {
char *busid = xf86_platform_odev_attributes(i)->busid;
@@ -327,8 +327,8 @@ xf86platformProbe(void)
XNFasprintf(&path, "%s,%s", cl->modulepath,
path ? path : xf86ModulePath);
free(old_path);
- LogMessageVerb(X_CONFIG, 1, "OutputClass \"%s\" ModulePath extended to \"%s\"\n",
- cl->identifier, path);
+ xf86Msg(X_CONFIG, "OutputClass \"%s\" ModulePath extended to \"%s\"\n",
+ cl->identifier, path);
LoaderSetPath(path);
}
}
@@ -344,8 +344,8 @@ xf86platformProbe(void)
continue;
if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) {
- LogMessageVerb(X_CONFIG, 1, "OutputClass \"%s\" setting %s as PrimaryGPU\n",
- cl->identifier, dev->attribs->path);
+ xf86Msg(X_CONFIG, "OutputClass \"%s\" setting %s as PrimaryGPU\n",
+ cl->identifier, dev->attribs->path);
primaryBus.type = BUS_PLATFORM;
primaryBus.id.plat = dev;
return 0;
@@ -395,8 +395,8 @@ xf86MergeOutputClassOptions(int entityIndex, void **options)
}
break;
default:
- LogMessageVerb(X_DEBUG, 1, "xf86MergeOutputClassOptions unsupported bus type %d\n",
- entity->bus.type);
+ xf86Msg(X_DEBUG, "xf86MergeOutputClassOptions unsupported bus type %d\n",
+ entity->bus.type);
}
if (!dev)
@@ -406,8 +406,8 @@ xf86MergeOutputClassOptions(int entityIndex, void **options)
if (!OutputClassMatches(cl, dev) || !cl->option_lst)
continue;
- LogMessageVerb(X_INFO, 1, "Applying OutputClass \"%s\" options to %s\n",
- cl->identifier, dev->attribs->path);
+ xf86Msg(X_INFO, "Applying OutputClass \"%s\" options to %s\n",
+ cl->identifier, dev->attribs->path);
classopts = xf86optionListDup(cl->option_lst);
*options = xf86optionListMerge(*options, classopts);
@@ -653,8 +653,8 @@ xf86PlatformFindHotplugDriver(int dev_index)
}
/* Return the first driver from the match list */
- LogMessageVerb(X_INFO, 1, "matching hotplug-driver is %s\n",
- hp_driver ? hp_driver : "none");
+ xf86Msg(X_INFO, "matching hotplug-driver is %s\n",
+ hp_driver ? hp_driver : "none");
return hp_driver;
}
@@ -811,13 +811,13 @@ void xf86platformPrimary(void)
{
/* use the first platform device as a fallback */
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) {
primaryBus.id.plat = &xf86_platform_devices[0];
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);
}
}
}
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 3beb17dfc..e94b8f1c6 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -224,7 +224,7 @@ xf86SbusProbe(void)
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);
if (promPath) {
xf86ErrorF(" at %s", promPath);
@@ -232,7 +232,7 @@ xf86SbusProbe(void)
}
}
else
- LogMessageVerb(X_PROBED, 1, "SBUS: %s", psdp->descr);
+ xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
xf86ErrorF("\n");
}
if (useProm)
@@ -464,11 +464,11 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
if (devList[j]->busID && *devList[j]->busID) {
if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
if (devBus)
- LogMessageVerb(X_WARNING, 0,
- "%s: More than one matching Device section for "
- "instance (BusID: %s) found: %s\n",
- driverName, devList[j]->identifier,
- devList[j]->busID);
+ xf86MsgVerb(X_WARNING, 0,
+ "%s: More than one matching Device section for "
+ "instance (BusID: %s) found: %s\n",
+ driverName, devList[j]->identifier,
+ devList[j]->busID);
else
devBus = devList[j];
}
@@ -476,34 +476,34 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
else {
if (!dev && !devBus) {
if (promPath)
- LogMessageVerb(X_PROBED, 1,
- "Assigning device section with no busID to SBUS:%s\n",
- promPath);
+ xf86Msg(X_PROBED,
+ "Assigning device section with no busID to SBUS:%s\n",
+ promPath);
else
- LogMessageVerb(X_PROBED, 1,
- "Assigning device section with no busID to SBUS:fb%d\n",
- psdp->fbNum);
+ xf86Msg(X_PROBED,
+ "Assigning device section with no busID to SBUS:fb%d\n",
+ psdp->fbNum);
dev = devList[j];
}
else
- LogMessageVerb(X_WARNING, 0,
- "%s: More than one matching Device section "
- "found: %s\n", driverName,
- devList[j]->identifier);
+ xf86MsgVerb(X_WARNING, 0,
+ "%s: More than one matching Device section "
+ "found: %s\n", driverName,
+ devList[j]->identifier);
}
}
if (devBus)
dev = devBus; /* busID preferred */
if (!dev && psdp->fd != -2) {
if (promPath) {
- LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
- "for instance (BusID SBUS:%s) found\n",
- driverName, promPath);
+ xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+ "for instance (BusID SBUS:%s) found\n",
+ driverName, promPath);
}
else
- LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
- "for instance (BusID SBUS:fb%d) found\n",
- driverName, psdp->fbNum);
+ xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+ "for instance (BusID SBUS:fb%d) found\n",
+ driverName, psdp->fbNum);
}
else if (dev) {
numClaimedInstances++;
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 75dba06fa..28d7497f1 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -89,8 +89,8 @@ handle_edid_quirks(xf86MonPtr m)
xf86ForEachDetailedBlock(m, find_max_detailed_clock, &clock);
if (clock && (ranges->max_clock * 1e6 < clock)) {
- LogMessageVerb(X_WARNING, 1, "EDID timing clock %.2f exceeds claimed max "
- "%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock);
+ xf86Msg(X_WARNING, "EDID timing clock %.2f exceeds claimed max "
+ "%dMHz, fixing\n", clock / 1.0e6, ranges->max_clock);
ranges->max_clock = (clock + 999999) / 1e6;
}
}
@@ -159,8 +159,8 @@ encode_aspect_ratio(xf86MonPtr m)
m->features.vsize = (p.real_vsize + 5) / 10;
}
- LogMessageVerb(X_INFO, 1, "Quirked EDID physical size to %dx%d cm\n",
- m->features.hsize, m->features.vsize);
+ xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
+ m->features.hsize, m->features.vsize);
}
}
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 237d1719a..e17bb941e 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -5630,6 +5630,17 @@ strongly encouraged to improve the consistency of driver behaviour.
+
+
+ xf86MsgVerb(MessageType type, int verb, const char *format, ...);
+
+
+ Like xf86Msg(), but with the verbosity level given
+ explicitly.
+
+
+
+
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...);
diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c
index 097003888..7d554e60a 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -28,7 +28,7 @@ fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
Bool
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;
}
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index 93d578aae..3c295b6dd 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -752,9 +752,9 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too)
}
else {
if (unalloc) {
- LogMessageVerb(X_ERROR, 1,
- "i2c bug: Attempt to remove I2C bus \"%s\", "
- "but device list is not empty.\n", b->BusName);
+ xf86Msg(X_ERROR,
+ "i2c bug: Attempt to remove I2C bus \"%s\", "
+ "but device list is not empty.\n", b->BusName);
return;
}
}
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index ed8ec4f87..fc4d83c16 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -211,7 +211,7 @@ stack_trace(xf86Int10InfoPtr pInt)
if (stack >= tail)
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++) {
xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
i = (i + 1) % 0x10;
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 8c69aa23e..4d61eeac2 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -67,7 +67,7 @@ dense_base(void)
init_abw();
/* 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;
}
@@ -112,14 +112,14 @@ checkDevMem(Bool warn)
if (base != MAP_FAILED) {
munmap((caddr_t) base, 4096);
devMemFd = fd;
- LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
- DEV_APERTURE);
+ xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
+ DEV_APERTURE);
return;
}
else {
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
- DEV_APERTURE, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+ DEV_APERTURE, strerror(errno));
}
}
}
@@ -136,23 +136,23 @@ checkDevMem(Bool warn)
}
else {
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+ DEV_MEM, strerror(errno));
}
}
}
if (warn) {
#ifndef HAS_APERTURE_DRV
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open/mmap %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to open/mmap %s (%s)\n",
+ DEV_MEM, strerror(errno));
#else
#ifndef __OpenBSD__
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
- "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+ "\t(%s)\n", DEV_APERTURE, DEV_MEM, strerror(errno));
#else /* __OpenBSD__ */
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
- "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
- SYSCTL_MSG);
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+ "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
+ SYSCTL_MSG);
#endif /* __OpenBSD__ */
#endif
xf86ErrorF("\tlinear framebuffer access unavailable\n");
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 5afdecaf8..ac34c9ad6 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -109,15 +109,15 @@ checkDevMem(Bool warn)
else {
/* This should not happen */
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+ DEV_MEM, strerror(errno));
}
return;
}
}
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
+ DEV_MEM, strerror(errno));
}
return;
}
@@ -140,8 +140,8 @@ xf86EnableIO()
return TRUE;
if ((IoFd = open("/dev/io", O_RDWR)) == -1) {
- LogMessageVerb(X_WARNING, 1,
- "xf86EnableIO: Failed to open /dev/io for extended I/O\n");
+ xf86Msg(X_WARNING, "xf86EnableIO: "
+ "Failed to open /dev/io for extended I/O\n");
return FALSE;
}
return TRUE;
@@ -182,16 +182,14 @@ xf86EnableIO()
IOPortBase = base;
}
else {
- LogMessageVerb(X_WARNING, 1,
- "EnableIO: failed to mmap /dev/ttyC0 (%s)\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "EnableIO: failed to mmap %s (%s)\n",
+ "/dev/ttyC0", strerror(errno));
return FALSE;
}
}
else {
- LogMessageVerb(X_WARNING, 1,
- "EnableIO: failed to open /dev/ttyC0 (%s)\n",
- strerror(errno));
+ xf86Msg("EnableIO: failed to open %s (%s)\n",
+ "/dev/ttyC0", strerror(errno));
return FALSE;
}
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index b524d7fa6..5c1323e1a 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -230,9 +230,9 @@ xf86OpenConsole(void)
* /dev/console
*/
if ((devConsoleFd = open("/dev/console", O_WRONLY, 0)) < 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86OpenConsole: couldn't open /dev/console (%s)\n",
- strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86OpenConsole: couldn't open /dev/console (%s)\n",
+ strerror(errno));
}
break;
#endif
@@ -259,7 +259,7 @@ xf86OpenConsole(void)
if (initialVT != 1) {
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);
}
@@ -274,14 +274,14 @@ xf86OpenConsole(void)
SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
if (result != 0) {
- LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_ACTIVATE failed\n");
+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
}
SYSCALL(result =
ioctl(xf86Info.consoleFd, VT_WAITACTIVE,
xf86Info.vtno));
if (result != 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86OpenConsole: VT_WAITACTIVE failed\n");
+ xf86Msg(X_WARNING,
+ "xf86OpenConsole: VT_WAITACTIVE failed\n");
}
OsSignal(SIGUSR1, xf86VTRequest);
@@ -321,7 +321,7 @@ xf86OpenConsole(void)
if (!xf86Info.ShareVTs && xf86Info.autoVTSwitch &&
(xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)) {
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 */
@@ -347,7 +347,7 @@ xf86OpenPccons(void)
CHECK_DRIVER_MSG);
}
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;
}
@@ -439,7 +439,7 @@ xf86OpenSyscons(void)
FatalError("xf86OpenSyscons: VT_GETMODE failed");
}
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) {
xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
syscons_version & 0xFF);
@@ -447,7 +447,7 @@ xf86OpenSyscons(void)
else {
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 {
/* VT_GETMODE failed, probably not syscons */
@@ -542,21 +542,21 @@ xf86OpenPcvt(void)
xf86Info.consType = PCVT;
#ifdef WSCONS_SUPPORT
#ifdef __NetBSD__
- LogMessageVerb(X_PROBED, 1,
- "Using wscons driver on %s in pcvt compatibility mode "
- "(version %d.%d)\n", vtname,
- pcvt_version.rmajor, pcvt_version.rminor);
+ xf86Msg(X_PROBED,
+ "Using wscons driver on %s in pcvt compatibility mode "
+ "(version %d.%d)\n", vtname,
+ pcvt_version.rmajor, pcvt_version.rminor);
#else
- LogMessageVerb(X_PROBED, 1,
- "Using wscons driver on %s in pcvt compatibility mode ",
- vtname);
+ xf86Msg(X_PROBED,
+ "Using wscons driver on %s in pcvt compatibility mode ",
+ vtname);
#endif
#else
# ifdef __NetBSD__
- LogMessageVerb(X_PROBED, 1, "Using pcvt driver (version %d.%d)\n",
- pcvt_version.rmajor, pcvt_version.rminor);
+ xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
+ pcvt_version.rmajor, pcvt_version.rminor);
# else
- LogMessageVerb(X_PROBED, 1, "Using pcvt driver\n");
+ xf86Msg(X_PROBED, "Using pcvt driver\n");
# endif
#endif
#ifdef __NetBSD__
@@ -599,7 +599,7 @@ xf86OpenWScons(void)
"xf86OpenConsole", strerror(errno), CHECK_DRIVER_MSG);
}
xf86Info.consType = WSCONS;
- LogMessageVerb(X_PROBED, 1, "Using wscons driver\n");
+ xf86Msg(X_PROBED, "Using wscons driver\n");
}
return fd;
}
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index ef5c66cb3..6374b5f80 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -96,8 +96,8 @@ checkDevMem(Bool warn)
else {
/* This should not happen */
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+ DEV_MEM, strerror(errno));
}
useDevMem = FALSE;
return;
@@ -105,8 +105,8 @@ checkDevMem(Bool warn)
}
#ifndef HAS_APERTURE_DRV
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s (%s)\n",
- DEV_MEM, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s (%s)\n",
+ DEV_MEM, strerror(errno));
}
useDevMem = FALSE;
return;
@@ -121,27 +121,27 @@ checkDevMem(Bool warn)
munmap((caddr_t) base, 4096);
devMemFd = fd;
useDevMem = TRUE;
- LogMessageVerb(X_INFO, 1, "checkDevMem: using aperture driver %s\n",
- DEV_APERTURE);
+ xf86Msg(X_INFO, "checkDevMem: using aperture driver %s\n",
+ DEV_APERTURE);
return;
}
else {
if (warn) {
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to mmap %s (%s)\n",
- DEV_APERTURE, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to mmap %s (%s)\n",
+ DEV_APERTURE, strerror(errno));
}
}
}
else {
if (warn) {
#ifndef __OpenBSD__
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
- "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+ "\t(%s)\n", DEV_MEM, DEV_APERTURE, strerror(errno));
#else /* __OpenBSD__ */
- LogMessageVerb(X_WARNING, 1, "checkDevMem: failed to open %s and %s\n"
- "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
- SYSCTL_MSG);
+ xf86Msg(X_WARNING, "checkDevMem: failed to open %s and %s\n"
+ "\t(%s)\n%s", DEV_MEM, DEV_APERTURE, strerror(errno),
+ SYSCTL_MSG);
#endif /* __OpenBSD__ */
}
}
@@ -177,9 +177,11 @@ xf86EnableIO(void)
if (i386_iopl(TRUE) < 0) {
#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
- 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
return FALSE;
}
@@ -220,9 +222,11 @@ xf86EnableIO(void)
if (amd64_iopl(TRUE) < 0) {
#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
- 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
return FALSE;
}
@@ -258,7 +262,8 @@ xf86EnableIO(void)
return TRUE;
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 TRUE;
@@ -289,9 +294,9 @@ xf86SetTVOut(int mode)
case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86SetTVOut: Could not set console to TV output, %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86SetTVOut: Could not set console to TV output, %s\n",
+ strerror(errno));
}
}
break;
@@ -312,9 +317,9 @@ xf86SetRGBOut(void)
case PCCONS:{
if (ioctl(xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86SetTVOut: Could not set console to RGB output, %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86SetTVOut: Could not set console to RGB output, %s\n",
+ strerror(errno));
}
}
break;
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 2f4d30007..493f886ee 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -60,13 +60,13 @@ xf86EnableIO()
{
int fd = xf86Info.consoleFd;
- LogMessageVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
+ xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED) {
ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
0xf2000000);
- LogMessageVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
+ xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
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;
}
}
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index 2da3c5250..50825cdfa 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -149,7 +149,7 @@ lnxACPIOpen(void)
strcpy(addr.sun_path, ACPI_SOCKET);
if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) {
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));
warned = 1;
shutdown(fd, 2);
@@ -161,7 +161,7 @@ lnxACPIOpen(void)
xf86PMGetEventFromOs = lnxACPIGetEventFromOs;
xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
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;
return lnxCloseACPI;
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index a06d49fbe..4377caa20 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -165,7 +165,7 @@ lnxAPMOpen(void)
DebugF("APM: Opening device\n");
if ((fd = open(APM_DEVICE, O_RDWR)) > -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));
close(fd);
return NULL;
@@ -175,7 +175,7 @@ lnxAPMOpen(void)
xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
- LogMessageVerb(X_INFO, 3, "Open APM successful\n");
+ xf86MsgVerb(X_INFO, 3, "Open APM successful\n");
return lnxCloseAPM;
}
return NULL;
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index e7f451397..16c3dc535 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -73,13 +73,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
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;
}
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
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;
}
@@ -145,7 +145,7 @@ linux_parse_vt_settings(int may_fail)
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 */
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) {
- LogMessageVerb(X_PROBED, 1,
- "controlling tty is VT number %d, auto-enabling KeepTty\n",
- current_vt);
+ xf86Msg(X_PROBED,
+ "controlling tty is VT number %d, auto-enabling KeepTty\n",
+ current_vt);
KeepTty = TRUE;
}
@@ -196,13 +196,13 @@ xf86OpenConsole(void)
* group leader
*/
if (setpgid(0, ppgid) < 0)
- LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setpgid failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86OpenConsole: setpgid failed: %s\n",
+ strerror(errno));
/* become process group leader */
if ((setsid() < 0))
- LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: setsid failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86OpenConsole: setsid failed: %s\n",
+ strerror(errno));
}
i = 0;
@@ -223,8 +223,8 @@ xf86OpenConsole(void)
*/
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0)
- LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
+ strerror(errno));
else
activeVT = vts.v_active;
@@ -320,23 +320,23 @@ xf86CloseConsole(void)
/* Back to text mode ... */
SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
if (ret < 0)
- LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: KDSETMODE failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
+ strerror(errno));
SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
if (ret < 0)
- LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_GETMODE failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
+ strerror(errno));
else {
/* set dflt vt handling */
VT.mode = VT_AUTO;
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
if (ret < 0)
- LogMessageVerb(X_WARNING, 1, "xf86CloseConsole: VT_SETMODE failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
+ strerror(errno));
}
if (xf86Info.autoVTSwitch) {
@@ -347,8 +347,8 @@ xf86CloseConsole(void)
if (activeVT >= 0) {
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
if (ret < 0) {
- LogMessageVerb(X_WARNING, 1, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
- strerror(errno));
+ xf86Msg(X_WARNING, "xf86OpenConsole: VT_GETSTATE failed: %s\n",
+ strerror(errno));
} else {
if (vts.v_active == xf86Info.vtno) {
switch_to(activeVT, "xf86CloseConsole");
diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c
index 4be481baa..6d1222655 100644
--- a/hw/xfree86/os-support/linux/lnx_kmod.c
+++ b/hw/xfree86/os-support/linux/lnx_kmod.c
@@ -72,12 +72,12 @@ xf86LoadKernelModule(const char *modName)
* preinstall agpgart module for some DRM modules
*/
if (setreuid(0, 0)) {
- LogMessageVerb(X_WARNING, 1, "LoadKernelModule: "
- "Setting of real/effective user Id to 0/0 failed");
+ xf86Msg(X_WARNING, "LoadKernelModule: "
+ "Setting of real/effective user Id to 0/0 failed");
}
setenv("PATH", "/sbin", 1);
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 */
break;
case -1: /* fork failed */
diff --git a/hw/xfree86/os-support/shared/drm_platform.c b/hw/xfree86/os-support/shared/drm_platform.c
index a2607d1cc..f6291e44d 100644
--- a/hw/xfree86/os-support/shared/drm_platform.c
+++ b/hw/xfree86/os-support/shared/drm_platform.c
@@ -61,7 +61,7 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
v = drmGetVersion(fd);
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;
}
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 028b16b97..b5a9c87fd 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -124,7 +124,7 @@ xf86OpenSerial(XF86OptionPtr options)
dev = xf86SetStrOption(options, "Device", NULL);
if (!dev) {
- LogMessageVerb(X_ERROR, 1, "xf86OpenSerial: No Device specified.\n");
+ xf86Msg(X_ERROR, "xf86OpenSerial: No Device specified.\n");
return -1;
}
@@ -134,9 +134,9 @@ xf86OpenSerial(XF86OptionPtr options)
SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
if (fd == -1) {
- LogMessageVerb(X_ERROR, 1,
- "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
- dev, strerror(errno));
+ xf86Msg(X_ERROR,
+ "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
+ dev, strerror(errno));
free(dev);
return -1;
}
@@ -209,7 +209,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
cfsetospeed(&t, baud);
}
else {
- LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", val);
+ xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", val);
return -1;
}
}
@@ -223,7 +223,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CSTOPB;
break;
default:
- LogMessageVerb(X_ERROR, 1, "Invalid Option StopBits value: %d\n", val);
+ xf86Msg(X_ERROR, "Invalid Option StopBits value: %d\n", val);
return -1;
break;
}
@@ -248,7 +248,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag |= CS8;
break;
default:
- LogMessageVerb(X_ERROR, 1, "Invalid Option DataBits value: %d\n", val);
+ xf86Msg(X_ERROR, "Invalid Option DataBits value: %d\n", val);
return -1;
break;
}
@@ -266,7 +266,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_cflag &= ~(PARENB);
}
else {
- LogMessageVerb(X_ERROR, 1, "Invalid Option Parity value: %s\n", s);
+ xf86Msg(X_ERROR, "Invalid Option Parity value: %s\n", s);
free(s);
return -1;
}
@@ -295,7 +295,7 @@ xf86SetSerial(int fd, XF86OptionPtr options)
t.c_iflag &= ~(IXON | IXOFF);
}
else {
- LogMessageVerb(X_ERROR, 1, "Invalid Option FlowControl value: %s\n", s);
+ xf86Msg(X_ERROR, "Invalid Option FlowControl value: %s\n", s);
free(s);
return -1;
}
@@ -311,14 +311,14 @@ xf86SetSerial(int fd, XF86OptionPtr options)
SYSCALL(ioctl(fd, TIOCCDTR, NULL));
#endif
#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;
#endif
xf86MarkOptionUsedByName(options, "ClearDTR");
}
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;
xf86MarkOptionUsedByName(options, "ClearRTS");
}
@@ -347,7 +347,7 @@ xf86SetSerialSpeed(int fd, int speed)
cfsetospeed(&t, baud);
}
else {
- LogMessageVerb(X_ERROR, 1, "Invalid Option BaudRate value: %d\n", speed);
+ xf86Msg(X_ERROR, "Invalid Option BaudRate value: %d\n", speed);
return -1;
}
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index d1d0b15b9..760a39b32 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -145,7 +145,7 @@ xf86SIGIO(int sig)
}
}
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 */
errno = save_errno;
@@ -198,13 +198,13 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
block_sigio();
#ifdef O_ASYNC
if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) {
- LogMessageVerb(X_WARNING, 1, "fcntl(%d, O_ASYNC): %s\n",
- fd, strerror(errno));
+ xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n",
+ fd, strerror(errno));
}
else {
if (fcntl(fd, F_SETOWN, getpid()) == -1) {
- LogMessageVerb(X_WARNING, 1, "fcntl(%d, F_SETOWN): %s\n",
- fd, strerror(errno));
+ xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
+ fd, strerror(errno));
}
else {
installed = TRUE;
@@ -215,8 +215,8 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
/* System V Streams - used on Solaris for input devices */
if (!installed && isastream(fd)) {
if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
- LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG): %s\n",
- fd, strerror(errno));
+ xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
+ fd, strerror(errno));
}
else {
installed = TRUE;
@@ -283,8 +283,8 @@ xf86RemoveSIGIOHandler(int fd)
#if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
if (isastream(fd)) {
if (ioctl(fd, I_SETSIG, 0) == -1) {
- LogMessageVerb(X_WARNING, 1, "fcntl(%d, I_SETSIG, 0): %s\n",
- fd, strerror(errno));
+ xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
+ fd, strerror(errno));
}
}
#endif
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index 0bfeca194..cddc6b3cb 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -116,14 +116,14 @@ sunPMGetEventFromOS(int fd, pmEvent * events, int num)
if (ioctl(fd, SRN_IOC_NEXTEVENT, &sunEvent) < 0) {
if (errno != EAGAIN) {
- LogMessageVerb(X_WARNING, 1, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
- " %s\n", strerror(errno));
+ xf86Msg(X_WARNING, "sunPMGetEventFromOS: SRN_IOC_NEXTEVENT"
+ " %s\n", strerror(errno));
}
break;
}
events[i] = sunToXF86(sunEvent.type);
}
- LogMessageVerb(X_WARNING, 1, "Got some events\n");
+ xf86Msg(X_WARNING, "Got some events\n");
return i;
}
@@ -141,11 +141,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_SYS_SUSPEND:
case XF86_APM_CRITICAL_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)
return PM_CONTINUE;
else {
- LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
+ xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_SUSPEND"
" %s\n", strerror(errno));
return PM_FAILED;
}
@@ -154,11 +154,11 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
case XF86_APM_CRITICAL_RESUME:
case XF86_APM_STANDBY_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)
return PM_CONTINUE;
else {
- LogMessageVerb(X_WARNING, 1, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
+ xf86Msg(X_WARNING, "sunPMConfirmEventToOs: SRN_IOC_RESUME"
" %s\n", strerror(errno));
return PM_FAILED;
}
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 9b497c66f..e374ed826 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -71,8 +71,8 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
if (audioFD == -1) {
- LogMessageVerb(X_ERROR, 1, "Bell: cannot open audio device \"%s\": %s\n",
- AUDIO_DEVICE, strerror(errno));
+ xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",
+ AUDIO_DEVICE, strerror(errno));
return;
}
@@ -119,9 +119,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
audioInfo.play.gain = min(AUDIO_MAX_GAIN, AUDIO_MAX_GAIN * loudness / 100);
if (ioctl(audioFD, AUDIO_SETINFO, &audioInfo) < 0) {
- LogMessageVerb(X_ERROR, 1,
- "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
- AUDIO_DEVICE, strerror(errno));
+ xf86Msg(X_ERROR,
+ "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
+ AUDIO_DEVICE, strerror(errno));
close(audioFD);
return;
}
@@ -150,9 +150,9 @@ xf86OSRingBell(int loudness, int pitch, int duration)
if (written == -1) {
if (errno != EAGAIN) {
- LogMessageVerb(X_ERROR, 1,
- "Bell: writev failed on audio device \"%s\": %s\n",
- AUDIO_DEVICE, strerror(errno));
+ xf86Msg(X_ERROR,
+ "Bell: writev failed on audio device \"%s\": %s\n",
+ AUDIO_DEVICE, strerror(errno));
close(audioFD);
return;
}
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index ce2631179..2197df6f2 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -77,13 +77,13 @@ switch_to(int vt, const char *from)
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
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));
SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
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));
}
#endif
@@ -146,7 +146,7 @@ xf86OpenConsole(void)
if (vtEnabled == 0) {
/* VT not enabled - kernel too old or Sparc platforms
without visual_io support */
- LogMessageVerb(from, 1, "VT infrastructure is not available\n");
+ xf86Msg(from, "VT infrastructure is not available\n");
xf86StartVT = 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);
if (fd != -1) {
@@ -207,8 +207,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
- LogMessageVerb(X_WARNING, 1,
- "xf86OpenConsole: VT_SET_CONSUSER failed\n");
+ xf86Msg(X_WARNING,
+ "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
@@ -225,16 +225,16 @@ xf86OpenConsole(void)
FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
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
#ifdef KDSETMODE
SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
if (i < 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
- consoleDev, strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
+ consoleDev, strerror(errno));
}
#endif
}
@@ -251,8 +251,8 @@ xf86OpenConsole(void)
#ifdef VT_SET_CONSUSER /* added in snv_139 */
if (strcmp(display, "0") == 0)
if (ioctl(xf86Info.consoleFd, VT_SET_CONSUSER) != 0)
- LogMessageVerb(X_WARNING, 1,
- "xf86OpenConsole: VT_SET_CONSUSER failed\n");
+ xf86Msg(X_WARNING,
+ "xf86OpenConsole: VT_SET_CONSUSER failed\n");
#endif
/*
@@ -288,18 +288,18 @@ xf86CloseConsole(void)
* the system, rather than only the console.
*/
if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
- LogMessageVerb(X_WARNING, 1,
- "xf86CloseConsole(): unable to open framebuffer (%s)\n",
- strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86CloseConsole(): unable to open framebuffer (%s)\n",
+ strerror(errno));
}
else {
struct fbgattr fbattr;
if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
- LogMessageVerb(X_WARNING, 1,
- "xf86CloseConsole(): unable to retrieve framebuffer"
- " attributes (%s)\n", strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86CloseConsole(): unable to retrieve framebuffer"
+ " attributes (%s)\n", strerror(errno));
}
else {
void *fbdata;
@@ -307,9 +307,9 @@ xf86CloseConsole(void)
fbdata = mmap(NULL, fbattr.fbtype.fb_size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (fbdata == MAP_FAILED) {
- LogMessageVerb(X_WARNING, 1,
- "xf86CloseConsole(): unable to mmap framebuffer"
- " (%s)\n", strerror(errno));
+ xf86Msg(X_WARNING,
+ "xf86CloseConsole(): unable to mmap framebuffer"
+ " (%s)\n", strerror(errno));
}
else {
memset(fbdata, 0, fbattr.fbtype.fb_size);
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index c609faddb..ac66bdf51 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -92,7 +92,7 @@ xf86EnableIO(void)
{
#if defined(__i386__) || defined(__i386) || defined(__x86)
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;
}
#endif /* i386 */