summaryrefslogtreecommitdiffstats
path: root/src
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
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 '')
-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);
16:10:31 -0700'>2021-07-26new exampleGravatar John Cowan 1-1/+4 2021-07-26updatesGravatar John Cowan 1-2/+4 2021-07-26dtd always first argumentGravatar John Cowan 1-9/+9 2021-07-26DTO to DTDGravatar John Cowan 1-55/+52 2021-07-26typoGravatar John Cowan 1-1/+1 2021-07-26switching to explicit dtosGravatar John Cowan 1-88/+102 2021-07-26errorsGravatar John Cowan 1-1/+4 2021-07-26more MN-W reviewGravatar John Cowan 1-5/+5 2021-07-26update preview linkGravatar John Cowan 1-1/+1 2021-07-26MN-W reviewGravatar John Cowan 1-6/+6 2021-07-26paired mutatorsGravatar John Cowan 1-43/+68 2021-07-25exceptionsGravatar John Cowan 1-1/+15 2021-07-25new exampleGravatar John Cowan 1-1/+4 2021-07-25updatesGravatar John Cowan 1-2/+4 2021-07-24dtd always first argumentGravatar John Cowan 1-9/+9 2021-07-23DTO to DTDGravatar John Cowan 1-55/+52 2021-07-22typoGravatar John Cowan 1-1/+1 2021-07-22switching to explicit dtosGravatar John Cowan 1-88/+102 2021-07-22errorsGravatar John Cowan 1-1/+4 2021-07-22more MN-W reviewGravatar John Cowan 1-5/+5 2021-07-20update preview linkGravatar John Cowan 1-1/+1 2021-07-20MN-W reviewGravatar John Cowan 1-6/+6 2021-07-18Fix typo.Gravatar Arthur A. Gleckler 2-4/+4 2021-07-18Add <p> around abstract.Gravatar Arthur A. Gleckler 1-2/+2 2021-07-18Publish first draft.draft-1Gravatar Arthur A. Gleckler 3-0/+114 2021-07-18Ignore trailing whitespace.Gravatar Arthur A. Gleckler 11-129/+129 2021-07-18Ignore "Dictionaries.log".Gravatar Arthur A. Gleckler 1-1/+2 2021-07-18Fix errors reported by W3C HTML Validator.Gravatar Arthur A. Gleckler 1-27/+27 2021-07-18Eliminate unnecessary redirect by using TLS/SSL.Gravatar Arthur A. Gleckler 1-1/+1