Author: dmaas
Date: 2002-10-25 23:13:33 -0400 (Fri, 25 Oct 2002)
New Revision: 645
Modified:
branches/rawiso/iso.h
branches/rawiso/raw1394.c
branches/rawiso/raw1394.h
Log:
change struct iso_packet_info layout and raw1394 poll behavior
Modified: branches/rawiso/iso.h
==============================================================================
--- branches/rawiso/iso.h (original)
+++ branches/rawiso/iso.h 2002-10-25 23:13:33.000000000 -0400
@@ -20,9 +20,9 @@
/* per-packet data embedded in the ringbuffer */
struct hpsb_iso_packet_info {
unsigned short len;
+ unsigned short cycle;
unsigned char channel;
unsigned char tag;
- unsigned char tcode;
unsigned char sy;
};
Modified: branches/rawiso/raw1394.c
==============================================================================
--- branches/rawiso/raw1394.c (original)
+++ branches/rawiso/raw1394.c 2002-10-25 23:13:33.000000000 -0400
@@ -1058,8 +1058,8 @@
}
/*
- POLLIN/OUT is for read/write requests
- POLLPRI is for ISO transmission and reception
+ POLLIN is for read requests
+ POLLOUT is for ISO transmission and reception
*/
static unsigned int raw1394_poll(struct file *file, poll_table *pt)
{
@@ -1076,7 +1076,7 @@
if(fi->iso_state != RAW1394_ISO_INACTIVE) {
if(hpsb_iso_n_ready(fi->iso_handle) > 0)
- mask |= POLLPRI;
+ mask |= POLLOUT;
}
return mask;
Modified: branches/rawiso/raw1394.h
==============================================================================
--- branches/rawiso/raw1394.h (original)
+++ branches/rawiso/raw1394.h 2002-10-25 23:13:33.000000000 -0400
@@ -84,9 +84,9 @@
/* must be identical to hpsb_iso_packet_info in iso.h! */
struct raw1394_iso_packet_info {
unsigned short len;
+ unsigned short cycle;
unsigned char channel;
unsigned char tag;
- unsigned char tcode;
unsigned char sy;
};
|
