Don't bother validating the Device section of the conf file
All the previous tests can now be recovered from if not specified.
This commit is contained in:
parent
28ef7f5941
commit
e3e1222111
|
@ -204,8 +204,6 @@ else\
|
||||||
"This section must have an Identifier line."
|
"This section must have an Identifier line."
|
||||||
#define ONLY_ONE_MSG \
|
#define ONLY_ONE_MSG \
|
||||||
"This section must have only one of either %s line."
|
"This section must have only one of either %s line."
|
||||||
#define UNDEFINED_DRIVER_MSG \
|
|
||||||
"Device section \"%s\" must have a Driver line."
|
|
||||||
#define UNDEFINED_INPUTDRIVER_MSG \
|
#define UNDEFINED_INPUTDRIVER_MSG \
|
||||||
"InputDevice section \"%s\" must have a Driver line."
|
"InputDevice section \"%s\" must have a Driver line."
|
||||||
#define INVALID_GAMMA_MSG \
|
#define INVALID_GAMMA_MSG \
|
||||||
|
|
|
@ -357,26 +357,6 @@ xf86freeDeviceList (XF86ConfDevicePtr ptr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
xf86validateDevice (XF86ConfigPtr p)
|
|
||||||
{
|
|
||||||
XF86ConfDevicePtr device = p->conf_device_lst;
|
|
||||||
|
|
||||||
if (!device) {
|
|
||||||
xf86validationError ("At least one Device section is required.");
|
|
||||||
return (FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
while (device) {
|
|
||||||
if (!device->dev_driver) {
|
|
||||||
xf86validationError (UNDEFINED_DRIVER_MSG, device->dev_identifier);
|
|
||||||
return (FALSE);
|
|
||||||
}
|
|
||||||
device = device->list.next;
|
|
||||||
}
|
|
||||||
return (TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
XF86ConfDevicePtr
|
XF86ConfDevicePtr
|
||||||
xf86findDevice (const char *ident, XF86ConfDevicePtr p)
|
xf86findDevice (const char *ident, XF86ConfDevicePtr p)
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,8 +80,6 @@ static xf86ConfigSymTabRec TopLevelTab[] =
|
||||||
static int
|
static int
|
||||||
xf86validateConfig (XF86ConfigPtr p)
|
xf86validateConfig (XF86ConfigPtr p)
|
||||||
{
|
{
|
||||||
/*if (!xf86validateDevice (p))
|
|
||||||
return FALSE;*/
|
|
||||||
if (!xf86validateScreen (p))
|
if (!xf86validateScreen (p))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if (!xf86validateInput (p))
|
if (!xf86validateInput (p))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user