Thread: [Linux1394-cvslog] rev 751 - trunk
Brought to you by:
aeb,
bencollins
From: SVN U. <dm...@li...> - 2003-02-01 14:23:35
|
Author: dmaas Date: 2003-01-15 08:12:56 -0500 (Wed, 15 Jan 2003) New Revision: 751 Modified: trunk/raw1394.c trunk/raw1394.h Log: rename RAW1394_ISO_STOP to RAW1394_ISO_XMIT_RECV_STOP to avoid clash with user-space name Modified: trunk/raw1394.c ============================================================================== --- trunk/raw1394.c (original) +++ trunk/raw1394.c 2003-02-01 08:59:32.000000000 -0500 @@ -2255,7 +2255,7 @@ return -EFAULT; return hpsb_iso_recv_start(fi->iso_handle, args[0], args[1], args[2]); } - case RAW1394_ISO_STOP: + case RAW1394_ISO_XMIT_RECV_STOP: hpsb_iso_stop(fi->iso_handle); return 0; case RAW1394_ISO_RECV_LISTEN_CHANNEL: @@ -2294,7 +2294,7 @@ } case RAW1394_ISO_XMIT_SYNC: return hpsb_iso_xmit_sync(fi->iso_handle); - case RAW1394_ISO_STOP: + case RAW1394_ISO_XMIT_RECV_STOP: hpsb_iso_stop(fi->iso_handle); return 0; case RAW1394_ISO_GET_STATUS: Modified: trunk/raw1394.h ============================================================================== --- trunk/raw1394.h (original) +++ trunk/raw1394.h 2003-02-01 08:59:33.000000000 -0500 @@ -122,7 +122,7 @@ #define RAW1394_ISO_RECV_INIT 2 /* arg: raw1394_iso_status* */ #define RAW1394_ISO_RECV_START 3 /* arg: int[3], { starting cycle, tag, sync } */ #define RAW1394_ISO_XMIT_START 8 /* arg: int[2], { starting cycle, prebuffer } */ -#define RAW1394_ISO_STOP 4 +#define RAW1394_ISO_XMIT_RECV_STOP 4 #define RAW1394_ISO_GET_STATUS 5 /* arg: raw1394_iso_status* */ #define RAW1394_ISO_PRODUCE_CONSUME 6 /* no longer used */ #define RAW1394_ISO_SHUTDOWN 7 |