diff options
Diffstat (limited to 'hw/xfree86/common/xf86DoScanPci.c')
| -rw-r--r-- | hw/xfree86/common/xf86DoScanPci.c | 57 |
1 files changed, 43 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 2328d2b05..8938c1d96 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -1,11 +1,34 @@ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoScanPci.c,v 1.15 2003/09/23 06:43:46 dawes Exp $ */ +/* + * Copyright (c) 1999-2002 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoScanPci.c,v 1.12 2002/07/15 20:46:01 dawes Exp $ */ /* * Finish setting up the server. * Call the functions from the scanpci module. - * - * Copyright 1999-2002 by The XFree86 Project, Inc. - * */ #include <ctype.h> @@ -38,11 +61,12 @@ void DoScanPci(int argc, char **argv, int i) OsInit(); /* - * now we decrease verbosity and remember the value, in case a later - * -verbose on the command line increases it, because that is a - * verbose flag for scanpci... + * The old verbosity processing that was here isn't useful anymore, but + * for compatibility purposes, ignore verbosity changes after the -scanpci + * flag. */ - globalVerbose = --xf86Verbose; + globalVerbose = xf86Verbose; + /* * next we process the arguments that are remaining on the command line, * so that things like the module path can be set there @@ -51,14 +75,19 @@ void DoScanPci(int argc, char **argv, int i) if ((skip = ddxProcessArgument(argc, argv, j))) j += (skip - 1); } + /* - * was the verbosity level increased? + * Was the verbosity level increased? If so, set it back. */ - if( (globalVerbose == 0) && (xf86Verbose > 0) ) - scanpciVerbose = xf86Verbose - globalVerbose -1; - else - scanpciVerbose = xf86Verbose - globalVerbose; - xf86Verbose = globalVerbose; + if (xf86Verbose > globalVerbose) + xf86SetVerbosity(globalVerbose); + + /* + * Setting scanpciVerbose to 0 will ensure that the output will go to + * stderr for all reasonable default stderr verbosity levels. + */ + scanpciVerbose = 0; + /* * now get the loader set up and load the scanpci module */ |