|
1 From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001 |
|
2 From: Adam Jackson <[email protected]> |
|
3 Date: Mon, 26 Oct 2009 15:43:50 -0400 |
|
4 Subject: [PATCH] s/xf86UDelay/usleep/g |
|
5 |
|
6 cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800 |
|
7 |
|
8 Signed-off-by: Adam Jackson <[email protected]> |
|
9 --- |
|
10 src/neo_driver.c | 6 ++++-- |
|
11 1 files changed, 4 insertions(+), 2 deletions(-) |
|
12 |
|
13 diff --git a/src/neo_driver.c b/src/neo_driver.c |
|
14 index ddb6812..e4c60f2 100644 |
|
15 --- a/src/neo_driver.c |
|
16 +++ b/src/neo_driver.c |
|
17 @@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|
18 #include <X11/extensions/xf86dgastr.h> |
|
19 #endif |
|
20 |
|
21 +#include <unistd.h> |
|
22 + |
|
23 /* Mandatory functions */ |
|
24 static const OptionInfoRec * NEOAvailableOptions(int chipid, int busid); |
|
25 static void NEOIdentify(int flags); |
|
26 @@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore, |
|
27 * In some rare cases a lockup might occur if we don't delay |
|
28 * here. (Reported by Miles Lane) |
|
29 */ |
|
30 - xf86UDelay(200000); |
|
31 + usleep(200000); |
|
32 /* |
|
33 * Disable horizontal and vertical graphics and text expansions so |
|
34 * that vgaHWRestore works properly. |
|
35 @@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore, |
|
36 * Sleep for 200ms to make sure that the two operations above have |
|
37 * had time to take effect. |
|
38 */ |
|
39 - xf86UDelay(200000); |
|
40 + usleep(200000); |
|
41 /* |
|
42 * This function handles restoring the generic VGA registers. */ |
|
43 vgaHWRestore(pScrn, VgaReg, |
|
44 -- |
|
45 1.5.6.5 |
|
46 |