summaryrefslogtreecommitdiffstats
path: root/src/errors.c
diff options
context:
space:
mode:
authorGravatar Dan Dennedy 2008-04-23 17:44:36 -0700
committerGravatar Dan Dennedy 2008-04-23 17:44:36 -0700
commit0ea462ae9895ca903c8d3134910c06e1869560c4 (patch)
treec1b72a170cfca14c1b9cccd552e5cadc249bd483 /src/errors.c
parentFix configure.ac missing fi after initial merge. (diff)
First cut at integrating juju
This is currently working with legacy ieee1394 and tools/testlibraw.
Diffstat (limited to 'src/errors.c')
-rw-r--r--src/errors.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/errors.c b/src/errors.c
index 63db73d..e69c131 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -19,10 +19,13 @@
raw1394_errcode_t raw1394_get_errcode(struct raw1394_handle *handle)
{
- return handle->err;
+ if (handle && handle->is_fw)
+ return handle->mode.fw->err;
+ else
+ return handle->mode.ieee1394->err;
}
-int raw1394_errcode_to_errno(raw1394_errcode_t errcode)
+int ieee1394_errcode_to_errno(raw1394_errcode_t errcode)
{
static const int ack2errno[16] = {
0xdead, /* invalid ack code */