peter
/
libraw1394
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More work on iso receive; handle payload wrapping.

This commit is contained in:
Kristian Høgsberg 2007-04-02 17:33:07 -04:00
parent 89281b5767
commit d9b43daf48
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
juju/juju.h
View File

@ -124,6 +124,7 @@ struct raw1394_handle {
int packet_index; int packet_index;
int packet_phase; int packet_phase;
int packet_tail; int packet_tail;
int packet_count;
int buf_packets; int buf_packets;
int max_packet_size; int max_packet_size;
enum raw1394_iso_dma_recv_mode recv_mode; enum raw1394_iso_dma_recv_mode recv_mode;

43
juju/raw1394-iso.c
View File

@ -60,6 +60,7 @@ refill_xmit_buffer(raw1394handle_t handle, struct fw_cdev_queue_iso *queue_iso)
data += handle->iso.max_packet_size; data += handle->iso.max_packet_size;
handle->iso.packet_index++; handle->iso.packet_index++;
handle->iso.packet_count++;
handle->iso.packet_phase++; handle->iso.packet_phase++;
if (handle->iso.packet_index == handle->iso.buf_packets) { if (handle->iso.packet_index == handle->iso.buf_packets) {
@ -123,11 +124,11 @@ int raw1394_iso_xmit_start(raw1394handle_t handle, int start_on_cycle,
static int static int
queue_recv_packets(raw1394handle_t handle) queue_recv_packets(raw1394handle_t handle)
{ {
int i;
struct fw_cdev_queue_iso queue_iso; struct fw_cdev_queue_iso queue_iso;
struct fw_cdev_iso_packet *p = handle->iso.packets; struct fw_cdev_iso_packet *p = handle->iso.packets;
unsigned int len; unsigned int len;
unsigned char *data, *buffer; unsigned char *data, *buffer;
int i;
buffer = handle->iso.buffer + buffer = handle->iso.buffer +
handle->iso.packet_index * handle->iso.max_packet_size; handle->iso.packet_index * handle->iso.max_packet_size;
@ -143,17 +144,22 @@ queue_recv_packets(raw1394handle_t handle)
data += handle->iso.max_packet_size; data += handle->iso.max_packet_size;
handle->iso.packet_index++; handle->iso.packet_index++;
handle->iso.packet_count++;
handle->iso.packet_phase++; handle->iso.packet_phase++;
if (handle->iso.packet_index == handle->iso.buf_packets)
handle->iso.packet_index = 0;
if (handle->iso.packet_phase == handle->iso.irq_interval) if (handle->iso.packet_phase == handle->iso.irq_interval)
handle->iso.packet_phase = 0; handle->iso.packet_phase = 0;
if (handle->iso.packet_index == handle->iso.buf_packets) {
handle->iso.packet_index = 0;
/* We can't handle wrapping payloads, so we need to
* break in this case.*/
i++;
break;
}
} }
queue_iso.packets = ptr_to_u64(handle->iso.packets); queue_iso.packets = ptr_to_u64(handle->iso.packets);
queue_iso.size = queue_iso.size = i * sizeof handle->iso.packets[0];
handle->iso.irq_interval * sizeof handle->iso.packets[0];
queue_iso.data = ptr_to_u64(buffer); queue_iso.data = ptr_to_u64(buffer);
len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso); len = ioctl(handle->iso.fd, FW_CDEV_IOC_QUEUE_ISO, &queue_iso);
@ -187,22 +193,23 @@ flush_recv_packets(raw1394handle_t handle,
channel = (header >> 8) & 0x3f; channel = (header >> 8) & 0x3f;
sy = header & 0x0f; sy = header & 0x0f;
fprintf(stderr,
"header: %08x, len=%d, channel=%d, tag=%d, sy=%d, packet_tail=0x%x\n",
header, len, channel, tag, sy, handle->iso.packet_tail);
d = handle->iso.recv_handler(handle, data, len, channel, d = handle->iso.recv_handler(handle, data, len, channel,
tag, sy, cycle, dropped); tag, sy, cycle, dropped);
data += handle->iso.max_packet_size; data += handle->iso.max_packet_size;
cycle++; cycle++;
handle->iso.packet_tail++;
handle->iso.packet_count--;
if (handle->iso.packet_tail == handle->iso.buf_packets) {
handle->iso.packet_tail = 0;
data = handle->iso.buffer;
}
} }
handle->iso.packet_tail += interrupt->header_length / 4; while (handle->iso.packet_count + handle->iso.irq_interval <=
if (handle->iso.packet_tail >= handle->iso.buf_packets) handle->iso.buf_packets)
handle->iso.packet_tail -= handle->iso.buf_packets; queue_recv_packets(handle);
queue_recv_packets(handle);
return 0; return 0;
} }
@ -212,7 +219,7 @@ int raw1394_iso_recv_start(raw1394handle_t handle, int start_on_cycle,
{ {
struct fw_cdev_start_iso start_iso; struct fw_cdev_start_iso start_iso;
while (handle->iso.packet_index + handle->iso.irq_interval < while (handle->iso.packet_count + handle->iso.irq_interval <=
handle->iso.buf_packets) handle->iso.buf_packets)
queue_recv_packets(handle); queue_recv_packets(handle);
@ -298,7 +305,6 @@ iso_init(raw1394handle_t handle, int type,
unsigned char channel, unsigned char channel,
enum raw1394_iso_speed speed, enum raw1394_iso_speed speed,
int irq_interval) int irq_interval)
{ {
struct fw_cdev_create_iso_context create; struct fw_cdev_create_iso_context create;
struct epoll_event ep; struct epoll_event ep;
@ -321,6 +327,7 @@ iso_init(raw1394handle_t handle, int type,
handle->iso.packet_index = 0; handle->iso.packet_index = 0;
handle->iso.packet_phase = 0; handle->iso.packet_phase = 0;
handle->iso.packet_tail = 0; handle->iso.packet_tail = 0;
handle->iso.packet_count = 0;
handle->iso.queue_iso.size = 0; handle->iso.queue_iso.size = 0;
handle->iso.packets = handle->iso.packets =
malloc(handle->iso.irq_interval * sizeof handle->iso.packets[0]); malloc(handle->iso.irq_interval * sizeof handle->iso.packets[0]);
@ -441,6 +448,10 @@ int raw1394_iso_recv_set_channel_mask(raw1394handle_t handle, u_int64_t mask)
void raw1394_iso_stop(raw1394handle_t handle) void raw1394_iso_stop(raw1394handle_t handle)
{ {
ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO); ioctl(handle->iso.fd, FW_CDEV_IOC_STOP_ISO);
handle->iso.packet_index = 0;
handle->iso.packet_tail = 0;
handle->iso.packet_phase = 0;
handle->iso.packet_count = 0;
} }
void raw1394_iso_shutdown(raw1394handle_t handle) void raw1394_iso_shutdown(raw1394handle_t handle)