Implement raw1394_(start_)phy_packet_write() on firewire-core

Requires kernel 2.6.36 or newer at runtime and linux-headers 2.6.36 or newer
at build time.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2010-07-14 17:33:37 +02:00
parent 926e9ea3ad
commit 824ababa4d
3 changed files with 81 additions and 18 deletions

View File

@ -292,7 +292,7 @@ int raw1394_phy_packet_write (raw1394handle_t handle, quadlet_t data)
return -1; return -1;
} }
if (handle->is_fw) if (handle->is_fw)
return fw_phy_packet_write(handle->mode.fw, data); return fw_phy_packet_write(handle, data);
else else
return ieee1394_phy_packet_write(handle, data); return ieee1394_phy_packet_write(handle, data);
} }

View File

@ -340,6 +340,16 @@ handle_device_event(raw1394handle_t handle,
sizeof u->iso_resource); sizeof u->iso_resource);
return 0; return 0;
#endif #endif
#ifdef FW_CDEV_EVENT_PHY_PACKET_SENT /* added in kernel 2.6.36 */
case FW_CDEV_EVENT_PHY_PACKET_SENT:
rc = u64_to_ptr(u->phy_packet.closure);
errcode = fw_to_raw1394_errcode(u->phy_packet.rcode);
tag = rc->tag;
free(rc);
return fwhandle->tag_handler(handle, tag, errcode);
#endif
default: default:
case FW_CDEV_EVENT_ISO_INTERRUPT: case FW_CDEV_EVENT_ISO_INTERRUPT:
/* Never happens. */ /* Never happens. */
@ -987,20 +997,6 @@ int fw_wake_up(fw_handle_t handle)
return fw_echo_request(handle, 0); return fw_echo_request(handle, 0);
} }
int fw_phy_packet_write (fw_handle_t handle, quadlet_t data)
{
errno = ENOSYS;
return -1;
}
int
fw_start_phy_packet_write(fw_handle_t handle,
quadlet_t data, unsigned long tag)
{
errno = ENOSYS;
return -1;
}
static int static int
send_request(fw_handle_t handle, int tcode, send_request(fw_handle_t handle, int tcode,
nodeid_t node, nodeaddr_t addr, nodeid_t node, nodeaddr_t addr,
@ -1222,6 +1218,47 @@ fw_start_async_stream(fw_handle_t handle, unsigned int channel,
0, addr, length, data, 0, NULL, rawtag); 0, addr, length, data, 0, NULL, rawtag);
} }
int
fw_start_phy_packet_write(fw_handle_t handle, quadlet_t data, unsigned long tag)
{
#ifdef FW_CDEV_IOC_SEND_PHY_PACKET /* added in kernel 2.6.36 */
struct fw_cdev_send_phy_packet send_phy_packet;
struct request_closure *closure;
int retval;
if (handle->local_device == NULL) {
handle->err = -EPERM;
errno = EPERM;
return -1;
}
closure = malloc(sizeof *closure);
if (closure == NULL) {
handle->err = -RCODE_SEND_ERROR;
errno = fw_errcode_to_errno(handle->err);
return -1;
}
closure->data = NULL;
closure->length = 0;
closure->tag = tag;
send_phy_packet.closure = ptr_to_u64(closure);
send_phy_packet.data[0] = be32_to_cpu(data);
send_phy_packet.data[1] = ~be32_to_cpu(data);
send_phy_packet.generation = handle->local_device->generation;
retval = ioctl(handle->local_device->fd, FW_CDEV_IOC_SEND_PHY_PACKET,
&send_phy_packet);
if (retval < 0)
free(closure);
return retval;
#else
errno = ENOSYS;
handle->err = -errno;
return -1;
#endif
}
int int
fw_start_async_send(fw_handle_t handle, fw_start_async_send(fw_handle_t handle,
@ -1357,6 +1394,32 @@ fw_async_stream(raw1394handle_t handle, unsigned int channel,
0, addr, length, data, 0, NULL); 0, addr, length, data, 0, NULL);
} }
int
fw_phy_packet_write(raw1394handle_t handle, quadlet_t data)
{
fw_handle_t fwhandle = handle->mode.fw;
struct raw1394_reqhandle reqhandle;
struct sync_data sd = { 0, 0 };
int err;
reqhandle.callback = sync_callback;
reqhandle.data = &sd;
err = fw_start_phy_packet_write(fwhandle, data,
(unsigned long) &reqhandle);
while (!sd.done) {
if (err < 0)
return err;
err = fw_loop_iterate(handle);
}
fwhandle->err = sd.err;
errno = fw_errcode_to_errno(sd.err);
return (errno ? -1 : 0);
}
int int
fw_async_send(fw_handle_t handle, fw_async_send(fw_handle_t handle,
size_t length, size_t header_length, size_t length, size_t header_length,

View File

@ -159,9 +159,6 @@ int fw_arm_get_buf(fw_handle_t handle, nodeaddr_t start,
size_t length, void *buf); size_t length, void *buf);
int fw_echo_request(fw_handle_t handle, quadlet_t data); int fw_echo_request(fw_handle_t handle, quadlet_t data);
int fw_wake_up(fw_handle_t handle); int fw_wake_up(fw_handle_t handle);
int fw_phy_packet_write (fw_handle_t handle, quadlet_t data);
int fw_start_phy_packet_write(fw_handle_t handle,
quadlet_t data, unsigned long tag);
int fw_start_read(fw_handle_t handle, nodeid_t node, nodeaddr_t addr, int fw_start_read(fw_handle_t handle, nodeid_t node, nodeaddr_t addr,
size_t length, quadlet_t *buffer, unsigned long tag); size_t length, quadlet_t *buffer, unsigned long tag);
int fw_start_write(fw_handle_t handle, nodeid_t node, nodeaddr_t addr, int fw_start_write(fw_handle_t handle, nodeid_t node, nodeaddr_t addr,
@ -176,6 +173,8 @@ int fw_start_async_stream(fw_handle_t handle, unsigned int channel,
unsigned int tag, unsigned int sy, unsigned int tag, unsigned int sy,
unsigned int speed, size_t length, quadlet_t *data, unsigned int speed, size_t length, quadlet_t *data,
unsigned long rawtag); unsigned long rawtag);
int fw_start_phy_packet_write(fw_handle_t handle,
quadlet_t data, unsigned long tag);
int fw_start_async_send(fw_handle_t handle, int fw_start_async_send(fw_handle_t handle,
size_t length, size_t header_length, size_t length, size_t header_length,
unsigned int expect_response, unsigned int expect_response,
@ -193,6 +192,7 @@ int fw_lock64(raw1394handle_t handle, nodeid_t node, nodeaddr_t addr,
int fw_async_stream(raw1394handle_t handle, unsigned int channel, int fw_async_stream(raw1394handle_t handle, unsigned int channel,
unsigned int tag, unsigned int sy, unsigned int speed, unsigned int tag, unsigned int sy, unsigned int speed,
size_t length, quadlet_t *data); size_t length, quadlet_t *data);
int fw_phy_packet_write(raw1394handle_t handle, quadlet_t data);
int fw_async_send(fw_handle_t handle, int fw_async_send(fw_handle_t handle,
size_t length, size_t header_length, size_t length, size_t header_length,
unsigned int expect_response, unsigned int expect_response,