diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2012-06-24 00:46:37 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2012-06-24 00:52:42 +0200 |
| commit | d0881b4effca805be2586a21d9bc1b3bd0607509 (patch) | |
| tree | 076b9d3d1a331d445a79a585182b2773b63cdba1 | |
| parent | 662d6534c7683699a7d2695bee1e873aa243360e (diff) | |
| download | libraw1394-d0881b4effca805be2586a21d9bc1b3bd0607509.tar.gz | |
Remove now unused code
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | src/fw-iso.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/fw-iso.c b/src/fw-iso.c index 0d2039d..d967bca 100644 --- a/src/fw-iso.c +++ b/src/fw-iso.c @@ -437,18 +437,6 @@ int fw_iso_recv_flush(fw_handle_t handle) return ioctl(handle->iso.fd, FW_CDEV_IOC_FLUSH_ISO, &flush); } -static unsigned int -round_to_power_of_two(unsigned int value) -{ - unsigned int pot; - - pot = 1; - while (pot < value) - pot <<= 1; - - return pot; -} - static int iso_init(fw_handle_t handle, int type, raw1394_iso_xmit_handler_t xmit_handler, @@ -461,25 +449,13 @@ iso_init(fw_handle_t handle, int type, { struct fw_cdev_create_iso_context create; struct epoll_event ep; - int retval, prot; + int retval; if (handle->iso.fd != -1) { errno = EBUSY; return -1; } - switch (type) { - case FW_CDEV_ISO_CONTEXT_TRANSMIT: - prot = PROT_READ | PROT_WRITE; - break; - case FW_CDEV_ISO_CONTEXT_RECEIVE: - prot = PROT_READ | PROT_WRITE; - break; - default: - errno = EINVAL; - return -1; - } - /* set irq_interval from < 1 to default values like ieee1394 rawiso */ if (irq_interval < 0) irq_interval = buf_packets / 4; @@ -538,7 +514,7 @@ iso_init(fw_handle_t handle, int type, handle->iso.buffer = mmap(NULL, buf_packets * handle->iso.max_packet_size, - prot, MAP_SHARED, handle->iso.fd, 0); + PROT_READ | PROT_WRITE, MAP_SHARED, handle->iso.fd, 0); if (handle->iso.buffer == MAP_FAILED) { close(handle->iso.fd); |