patch-2.4.22 linux-2.4.22/drivers/ieee1394/iso.h
Next file: linux-2.4.22/drivers/ieee1394/nodemgr.c
Previous file: linux-2.4.22/drivers/ieee1394/iso.c
Back to the patch index
Back to the overall index
- Lines: 42
- Date:
2003-08-25 04:44:41.000000000 -0700
- Orig file:
linux-2.4.21/drivers/ieee1394/iso.h
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/ieee1394/iso.h linux-2.4.22/drivers/ieee1394/iso.h
@@ -66,7 +66,7 @@
/* wait for buffer space */
wait_queue_head_t waitq;
- int speed; /* SPEED_100, 200, or 400 */
+ int speed; /* IEEE1394_SPEED_100, 200, or 400 */
int channel; /* -1 if multichannel */
/* greatest # of packets between interrupts - controls
@@ -79,9 +79,6 @@
/* size of data_buf, in bytes (always a multiple of PAGE_SIZE) */
unsigned int buf_size;
- /* ringbuffer of packet descriptors in regular kernel memory */
- struct hpsb_iso_packet_info *infos;
-
/* # of packets in the ringbuffer */
unsigned int buf_packets;
@@ -118,6 +115,11 @@
/* cycle at which next packet will be transmitted,
-1 if not known */
int xmit_cycle;
+
+ /* ringbuffer of packet descriptors in regular kernel memory
+ * XXX Keep this last, since we use over-allocated memory from
+ * this entry to fill this field. */
+ struct hpsb_iso_packet_info *infos;
};
/* functions available to high-level drivers (e.g. raw1394) */
@@ -163,6 +165,10 @@
/* N packets have been read out of the buffer, re-use the buffer space */
int hpsb_iso_recv_release_packets(struct hpsb_iso *recv, unsigned int n_packets);
+/* check for arrival of new packets immediately (even if irq_interval
+ has not yet been reached) */
+int hpsb_iso_recv_flush(struct hpsb_iso *iso);
+
/* returns # of packets ready to send or receive */
int hpsb_iso_n_ready(struct hpsb_iso *iso);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)