summaryrefslogtreecommitdiffstats
path: root/src/fw-iso.c
diff options
context:
space:
mode:
authorGravatar Stefan Richter 2012-06-24 00:46:37 +0200
committerGravatar Stefan Richter 2012-06-24 00:52:42 +0200
commitd0881b4effca805be2586a21d9bc1b3bd0607509 (patch)
tree076b9d3d1a331d445a79a585182b2773b63cdba1 /src/fw-iso.c
parentDisable power-of-2 alignment of isochronous I/O buffers (diff)
Remove now unused code
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'src/fw-iso.c')
-rw-r--r--src/fw-iso.c28
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);
f207f3abce4e3&follow=1'>Adapted testlibraw to new style error handling.Gravatar aeb 1-17/+18 2001-01-19Fix building errors.c.Gravatar aeb 2-0/+2 2001-01-19First implementation of new error reporting API.Gravatar aeb 7-28/+134 2001-01-04Fix misplaced device file in Debian installation.Gravatar aeb 3-3/+10 2000-12-12Debian scripts use makedev (>=2.3.1-49) in postinst by default now.Gravatar aeb 7-30/+104 2000-11-25Fix postinst ldconfig.Gravatar aeb 2-11/+11 2000-11-25Add some information about return values.Gravatar aeb 1-3/+29 2000-11-24Bump up version numbers for release.Gravatar aeb 2-3/+11 2000-11-24Added libraw1394.postinst.in to list of distributed files.Gravatar aeb 3-3/+35 2000-11-23Add ldconfig in deb postinst for Debian policy conformance.Gravatar aeb 2-2/+17 2000-11-23Removed acconfig.h, which wasn't needed for some time.Gravatar aeb 1-13/+0 2000-11-22Added ieee1394.h header.Gravatar aeb 3-1/+38 2000-09-13Fix raw1394_start_iso_write() which uses wrong variable.Gravatar aeb 1-1/+1 2000-09-10Work around compiler warnings for int/ptr casts.Gravatar aeb 6-10/+20 2000-09-10Added control files for Debian packages.Gravatar aeb 6-8/+106 2000-09-01Added missing prototypes for iso send functions.Gravatar aeb 1-0/+7 2000-08-08Added raw1394_get_irm_id().Gravatar aeb 7-7/+39 2000-08-06Added support for isochronous sending.Gravatar aeb 3-0/+35 2000-07-05Added raw1394_reset_bus() call.Gravatar aeb 4-0/+23 2000-06-22- Set library version info in configure.in, use in src/Makefile.am.Gravatar aeb 4-2/+16 2000-06-15Update libtool version number.Gravatar aeb 2-2/+2 2000-06-14Added copyright headers.Gravatar aeb 6-0/+54 2000-06-11Added explicit AC_PROG_INSTALL call.Gravatar aeb 1-0/+1 2000-06-09Fix size of error field.Gravatar aeb 1-2/+2 2000-06-02Modified support for 32/64 bit environments, control struct fields have fixed...Gravatar aeb 7-43/+28 2000-05-28Added support for environments with 64 bit kernel and 32 bit userland.Gravatar aeb 8-7/+45 2000-04-27Fixed missing setting of ext code in raw1394_start_lock()Gravatar aeb 1-0/+1 2000-04-15Fixed lock transaction to actually return response value.Gravatar aeb 3-5/+11 2000-04-12Add userdata functions as news.Gravatar aeb 1-0/+4 2000-04-05Add userdata functions.Gravatar aeb 3-0/+18 2000-03-18Bump version number to 0.6.Gravatar aeb 3-5/+6 2000-03-18Mention byte order change.Gravatar aeb 1-0/+2 2000-03-18Mention SourceForge home.Gravatar aeb 1-1/+5