Simplify auto device configuration for choosing wsfb, fbdev
I wanted to simplify the logic, and thought this is a good opportunity to eliminate local diffs. I don't want to list OSes without wsfb, because I understand that is a netbsd/openbsd driver, and always have it as a fallback for us. Additionally, I understand "fbdev" is linux-specific, so have the logic match this intent.
This commit is contained in:
parent
421e066ec4
commit
399cf1272a
|
@ -298,14 +298,10 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
|
||||||
xf86AddMatchedDriver(md, "modesetting");
|
xf86AddMatchedDriver(md, "modesetting");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(__sun)
|
|
||||||
/* Fallback to platform default frame buffer driver */
|
/* Fallback to platform default frame buffer driver */
|
||||||
#if !defined(__linux__) && defined(__sparc__)
|
#if defined(__linux__)
|
||||||
xf86AddMatchedDriver(md, "wsfb");
|
|
||||||
#else
|
|
||||||
xf86AddMatchedDriver(md, "fbdev");
|
xf86AddMatchedDriver(md, "fbdev");
|
||||||
#endif
|
#endif
|
||||||
#endif /* !__sun */
|
|
||||||
|
|
||||||
/* Fallback to platform default hardware */
|
/* Fallback to platform default hardware */
|
||||||
#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||||||
|
@ -313,6 +309,10 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
|
||||||
#elif defined(__sparc__) && !defined(__sun)
|
#elif defined(__sparc__) && !defined(__sun)
|
||||||
xf86AddMatchedDriver(md, "sunffb");
|
xf86AddMatchedDriver(md, "sunffb");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||||
|
xf86AddMatchedDriver(md, "wsfb");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* copy a screen section and enter the desired driver
|
/* copy a screen section and enter the desired driver
|
||||||
|
|
Loading…
Reference in New Issue