summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-05-09 09:26:17 +0100
committerAlan Hourihane <alanh@tungstengraphics.com>2008-05-09 09:26:17 +0100
commit7317e774b5cddb7218c1416fa4d9ee98756e4890 (patch)
treec42cfac7f1e336eda1ce0ec72260350e86095c3d /tests
parent7bcbc443f4f5161ab1e1a11cb6694e6d6269377c (diff)
Fix test applications for recent DRM changes
Diffstat (limited to 'tests')
-rw-r--r--tests/mode/modetest.c2
-rw-r--r--tests/modedemo/demo.c4
-rw-r--r--tests/modefb/demo.c7
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/mode/modetest.c b/tests/mode/modetest.c
index a50b0cc5..1fab0406 100644
--- a/tests/mode/modetest.c
+++ b/tests/mode/modetest.c
@@ -291,7 +291,7 @@ int testFrameBufferAdd(int fd, drmModeResPtr res)
goto err;
printf("\tAdding FB\n");
- ret = drmModeAddFB(fd, 800, 600, 32, 8, 0, bo->handle, &fb);
+ ret = drmModeAddFB(fd, 800, 600, 32, 8, 0, bo.handle, &fb);
if (ret)
goto err_bo;
diff --git a/tests/modedemo/demo.c b/tests/modedemo/demo.c
index 3fad984d..72d69405 100644
--- a/tests/modedemo/demo.c
+++ b/tests/modedemo/demo.c
@@ -603,7 +603,7 @@ void testCursor(int fd, uint32_t crtc)
prettyCursor(fd, bo.handle, 0xFFFF00FF);
printf("set cursor\n");
- drmModeSetCursor(fd, crtc, &bo, 64, 64);
+ drmModeSetCursor(fd, crtc, bo.handle, 64, 64);
printf("move cursor 0, 0\n");
drmModeMoveCursor(fd, crtc, 0, 0);
sleep(1);
@@ -614,7 +614,7 @@ void testCursor(int fd, uint32_t crtc)
printf("move cursor 100, 100\n");
drmModeMoveCursor(fd, crtc, 100, 100);
sleep(1);
- drmModeSetCursor(fd, crtc, NULL, 0, 0);
+ drmModeSetCursor(fd, crtc, 0, 0, 0);
}
void prettyCursor(int fd, unsigned int handle, unsigned int color)
diff --git a/tests/modefb/demo.c b/tests/modefb/demo.c
index b6d1f65b..ead53334 100644
--- a/tests/modefb/demo.c
+++ b/tests/modefb/demo.c
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
@@ -16,8 +17,6 @@ void cursor(int fd, int drmfd);
void prettyColors(int fd);
void prettyCursor(int fd, unsigned int handle, unsigned int color);
-extern void sleep(int);
-
struct fb_var_screeninfo var;
struct fb_fix_screeninfo fix;
@@ -152,7 +151,7 @@ void cursor(int fd, int drmfd)
}
prettyCursor(drmfd, bo.handle, 0xFFFF00FF);
- drmModeSetCursor(drmfd, crtc, &bo, 64, 64);
+ drmModeSetCursor(drmfd, crtc, bo.handle, 64, 64);
drmModeMoveCursor(drmfd, crtc, 0, 0);
sleep(1);
prettyCursor(drmfd, bo.handle, 0xFFFF0000);
@@ -160,7 +159,7 @@ void cursor(int fd, int drmfd)
sleep(1);
drmModeMoveCursor(drmfd, crtc, 100, 100);
sleep(1);
- drmModeSetCursor(drmfd, crtc, NULL, 0, 0);
+ drmModeSetCursor(drmfd, crtc, 0, 0, 0);
drmBOUnreference(drmfd, &bo);
}