peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapted testlibraw to new style error handling. 

git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@51 53a565d1-3bb7-0310-b661-cf11e63c67ab
This commit is contained in:
aeb 2001-01-27 02:28:29 +00:00
parent 90502a21ba
commit 87fb0bfc78
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/testlibraw.c
View File

@ -10,6 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <string.h>
#include <sys/poll.h> #include <sys/poll.h>
#include "raw1394.h" #include "raw1394.h"
@ -29,12 +30,15 @@ you haven't loaded the raw1394 module.\n";
quadlet_t buffer; quadlet_t buffer;
int my_tag_handler(raw1394handle_t handle, unsigned long tag, int error) int my_tag_handler(raw1394handle_t handle, unsigned long tag,
raw1394_errcode_t errcode)
{ {
if (error < 0) { int err = raw1394_errcode_to_errno(errcode);
printf("failed with error %d\n", error);
if (err) {
printf("failed with error: %s\n", strerror(err));
} else { } else {
printf("completed with 0x%08x, value 0x%08x\n", error, buffer); printf("completed with value 0x%08x\n", buffer);
} }
return 0; return 0;
@ -70,7 +74,7 @@ int main(int argc, char **argv)
struct pollfd pfd; struct pollfd pfd;
unsigned char fcp_test[] = { 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; unsigned char fcp_test[] = { 0x1, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
handle = raw1394_get_handle(); handle = raw1394_new_handle();
if (!handle) { if (!handle) {
if (!errno) { if (!errno) {
@ -136,20 +140,19 @@ int main(int argc, char **argv)
retval = raw1394_read(handle, 0xffc0 | i, TESTADDR, 4, &buffer); retval = raw1394_read(handle, 0xffc0 | i, TESTADDR, 4, &buffer);
if (retval < 0) { if (retval < 0) {
printf("failed with error %d\n", retval); perror("failed with error");
} else { } else {
printf("completed with 0x%08x, value 0x%08x\n", retval, printf("completed with value 0x%08x\n", buffer);
buffer);
} }
} }
printf("\ntesting FCP monitoring on local node\n"); printf("\ntesting FCP monitoring on local node\n");
raw1394_set_fcp_handler(handle, my_fcp_handler); raw1394_set_fcp_handler(handle, my_fcp_handler);
raw1394_start_fcp_listen(handle); raw1394_start_fcp_listen(handle);
retval = raw1394_write(handle, raw1394_get_local_id(handle), raw1394_write(handle, raw1394_get_local_id(handle),
CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_test), CSR_REGISTER_BASE + CSR_FCP_COMMAND, sizeof(fcp_test),
(quadlet_t *)fcp_test); (quadlet_t *)fcp_test);
retval = raw1394_write(handle, raw1394_get_local_id(handle), raw1394_write(handle, raw1394_get_local_id(handle),
CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_test), CSR_REGISTER_BASE + CSR_FCP_RESPONSE, sizeof(fcp_test),
(quadlet_t *)fcp_test); (quadlet_t *)fcp_test);
@ -158,13 +161,11 @@ int main(int argc, char **argv)
pfd.events = POLLIN; pfd.events = POLLIN;
pfd.revents = 0; pfd.revents = 0;
while (1) { while (1) {
if (poll(&pfd, 1, 10) < 1) break; retval = poll(&pfd, 1, 10);
if (retval < 1) break;
raw1394_loop_iterate(handle); raw1394_loop_iterate(handle);
} }
if (retval < 0) { if (retval < 0) perror("poll failed");
perror("poll failed");
}
exit(0); exit(0);
} }