diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2009-09-27 18:19:29 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2009-09-27 18:19:29 +0000 |
| commit | d2725a706d3c169b6d61a3ce833cdc544607465c (patch) | |
| tree | b45b650ea43ad0ce653ce9f25f13dfa5fab53d20 /driver/xf86-video-wsudl | |
| parent | 321fb9764781a32feda28df52f4f82fe20948a9e (diff) | |
Adapt to the new UDLIO_DAMAGE ioctl behaviour of udl(4).
Diffstat (limited to 'driver/xf86-video-wsudl')
| -rw-r--r-- | driver/xf86-video-wsudl/src/wsudl_driver.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/driver/xf86-video-wsudl/src/wsudl_driver.c b/driver/xf86-video-wsudl/src/wsudl_driver.c index 5f889f90f..a073486f6 100644 --- a/driver/xf86-video-wsudl/src/wsudl_driver.c +++ b/driver/xf86-video-wsudl/src/wsudl_driver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsudl_driver.c,v 1.4 2009/09/24 07:34:40 mglocker Exp $ */ +/* $OpenBSD: wsudl_driver.c,v 1.5 2009/09/27 18:19:28 mglocker Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -794,8 +794,6 @@ WsudlDamageInit(ScreenPtr pScreen) return (TRUE); } -#define ULDIO_DAMAGE_RETRY 100 - static void WsudlBlockHandler(pointer data, struct timeval **waitTime, pointer LastSelectMask) @@ -837,16 +835,9 @@ WsudlBlockHandler(pointer data, struct timeval **waitTime, } /* send damaged area to the device driver */ - for (i = 0; i < ULDIO_DAMAGE_RETRY; i++) { - ioctl(fPtr->fd, UDLIO_DAMAGE, &d); - if (d.status == UDLIO_STATUS_OK) - break; - /* device driver busy, have a break */ - usleep(10000); - } - if (i == ULDIO_DAMAGE_RETRY) { + (void)ioctl(fPtr->fd, UDLIO_DAMAGE, &d); + if (d.status != UDLIO_STATUS_OK) ErrorF("damage command failed, giving up!\n"); - } /* done */ DamageEmpty(fPtr->pDamage); |