diff options
| author |  aeb
| 2000-05-28 21:00:56 +0000 |
|---|---|---|
| committer | aeb
| 2000-05-28 21:00:56 +0000 |
| commit | 8942a29ac1c6b575e0eb93d903097be60c2276e2 (patch) | |
| tree | fba2bad931759dd0d79217041e8de955ba0cfdb3 /src | |
| parent | Fixed missing setting of ext code in raw1394_start_lock() (diff) | |
Added support for environments with 64 bit kernel and 32 bit userland.
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@26 53a565d1-3bb7-0310-b661-cf11e63c67ab
Diffstat (limited to 'src')
| -rw-r--r-- | src/eventloop.c | 1 | ||||
| -rw-r--r-- | src/fcp.c | 3 | ||||
| -rw-r--r-- | src/iso.c | 3 | ||||
| -rw-r--r-- | src/kernel-raw1394.h | 6 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/readwrite.c | 9 |
6 files changed, 18 insertions, 7 deletions
diff --git a/src/eventloop.c b/src/eventloop.c index e898ba7..85c68b5 100644 --- a/src/eventloop.c +++ b/src/eventloop.c @@ -1,4 +1,5 @@ +#include <config.h> #include <unistd.h> #include "raw1394.h" @@ -1,4 +1,5 @@ +#include <config.h> #include <errno.h> #include <unistd.h> @@ -18,7 +19,7 @@ static int do_fcp_listen(struct raw1394_handle *handle, int startstop) req->generation = handle->generation; req->misc = startstop; req->tag = (unsigned long)&rh; - req->recvb = handle->buffer; + req->recvb = (kptr_t)handle->buffer; req->length = 512; err = write(handle->fd, req, sizeof(*req)); @@ -1,4 +1,5 @@ +#include <config.h> #include <errno.h> #include <unistd.h> @@ -19,7 +20,7 @@ static int do_iso_listen(struct raw1394_handle *handle, int channel) req->generation = handle->generation; req->misc = channel; req->tag = (unsigned long)&rh; - req->recvb = handle->buffer; + req->recvb = (kptr_t)handle->buffer; req->length = HBUF_SIZE; err = write(handle->fd, req, sizeof(*req)); diff --git a/src/kernel-raw1394.h b/src/kernel-raw1394.h index f23bfc0..b17a033 100644 --- a/src/kernel-raw1394.h +++ b/src/kernel-raw1394.h @@ -56,8 +56,14 @@ struct raw1394_request { unsigned long tag; size_t length; + +#ifdef __KERNEL__ quadlet_t *sendb; quadlet_t *recvb; +#else + kptr_t sendb; + kptr_t recvb; +#endif }; struct raw1394_khost_list { @@ -1,4 +1,5 @@ +#include <config.h> #include <errno.h> #include <stdlib.h> #include <string.h> @@ -134,7 +135,7 @@ int raw1394_get_port_info(struct raw1394_handle *handle, CLEAR_REQ(req); req->type = RAW1394_REQ_LIST_CARDS; req->generation = handle->generation; - req->recvb = handle->buffer; + req->recvb = (kptr_t)handle->buffer; req->length = HBUF_SIZE; while (1) { diff --git a/src/readwrite.c b/src/readwrite.c index aa1db0e..d928e61 100644 --- a/src/readwrite.c +++ b/src/readwrite.c @@ -1,4 +1,5 @@ +#include <config.h> #include <unistd.h> #include <errno.h> @@ -21,7 +22,7 @@ int raw1394_start_read(struct raw1394_handle *handle, nodeid_t node, req->address = ((u_int64_t)node << 48) | addr; req->length = length; - req->recvb = buffer; + req->recvb = (kptr_t)buffer; return (int)write(handle->fd, req, sizeof(*req)); } @@ -40,7 +41,7 @@ int raw1394_start_write(struct raw1394_handle *handle, nodeid_t node, req->address = ((u_int64_t)node << 48) | addr; req->length = length; - req->sendb = data; + req->sendb = (kptr_t)data; return (int)write(handle->fd, req, sizeof(*req)); } @@ -64,8 +65,8 @@ int raw1394_start_lock(struct raw1394_handle *handle, nodeid_t node, req->tag = tag; req->address = ((u_int64_t)node << 48) | addr; - req->sendb = sendbuf; - req->recvb = result; + req->sendb = (kptr_t)sendbuf; + req->recvb = (kptr_t)result; req->misc = extcode; switch (extcode) { |