More updates to patch, run autoheader.
This commit is contained in:
parent
c7c35b57d1
commit
ef2a11fff1
@ -211,7 +211,7 @@ Index: juju/raw1394-iso.c
|
||||
===================================================================
|
||||
--- juju/raw1394-iso.c (revision 0)
|
||||
+++ juju/raw1394-iso.c (revision 0)
|
||||
@@ -0,0 +1,377 @@
|
||||
@@ -0,0 +1,385 @@
|
||||
+/* -*- c-basic-offset: 8 -*-
|
||||
+ *
|
||||
+ * raw1394-iso.c -- Emulation of the raw1394 rawiso API on the juju stack
|
||||
@ -288,6 +288,8 @@ Index: juju/raw1394-iso.c
|
||||
+ queue_iso->size =
|
||||
+ handle->iso.irq_interval * sizeof handle->iso.packets[0];
|
||||
+ queue_iso->data = ptr_to_u64(buffer);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
@ -329,7 +331,7 @@ Index: juju/raw1394-iso.c
|
||||
+
|
||||
+ return flush_xmit_packets(handle, handle->iso.buf_packets);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int
|
||||
+handle_recv_packets(raw1394handle_t handle,
|
||||
+ struct fw_cdev_event_iso_interrupt *interrupt)
|
||||
@ -356,6 +358,8 @@ Index: juju/raw1394-iso.c
|
||||
+ tag, sy, cycle, dropped);
|
||||
+ cycle++;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int raw1394_iso_recv_start(raw1394handle_t handle, int start_on_cycle,
|
||||
@ -391,10 +395,10 @@ Index: juju/raw1394-iso.c
|
||||
+ handle->iso.packet_index -= handle->iso.irq_interval;
|
||||
+ return flush_xmit_packets(handle, handle->iso.buf_packets);
|
||||
+ case FW_CDEV_ISO_CONTEXT_RECEIVE:
|
||||
+ break;
|
||||
+ return handle_recv_packets(handle, interrupt);
|
||||
+ default:
|
||||
+ /* Doesn't happen. */
|
||||
+ break;
|
||||
+ return -1;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
@ -426,11 +430,15 @@ Index: juju/raw1394-iso.c
|
||||
+int raw1394_iso_xmit_sync(raw1394handle_t handle)
|
||||
+{
|
||||
+ /* FIXME: queue a skip packet and wait for that interrupt. */
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int raw1394_iso_recv_flush(raw1394handle_t handle)
|
||||
+{
|
||||
+ /* FIXME: huh, we'll need kernel support here... */
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int raw1394_iso_xmit_init(raw1394handle_t handle,
|
||||
|
||||
@ -36,6 +36,7 @@ test -e %{_builddir}/fw-device-cdev.h || \
|
||||
cp %{_sourcedir}/fw-device-cdev.h %{_builddir}
|
||||
|
||||
aclocal
|
||||
autoheader
|
||||
autoconf
|
||||
automake
|
||||
%configure --disable-static --with-juju-dir=$PWD/..
|
||||
|
||||
Loading…
Reference in New Issue
Block a user