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

Add 1394b speed codes to <libraw1394/{ieee,raw}1394.h> 

This catapults the libraw1394 API into the year 2002.

Actually, passing speed codes of 3...5 into the relevant libraw1394
functions should be working already since the kernel gained 1394b
support a long time ago and libraw1394 does not check values.
The added definitions are only for clarity and to fully match the
argument type in the function declarations.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2012-06-30 16:46:55 +02:00
parent 300ac84d06
commit 03faa97445
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ieee1394.h
View File

@ -18,6 +18,11 @@
#define L1394_SPEED_100 0x0 #define L1394_SPEED_100 0x0
#define L1394_SPEED_200 0x1 #define L1394_SPEED_200 0x1
#define L1394_SPEED_400 0x2 #define L1394_SPEED_400 0x2
/* added in libraw1394 v2.1.0: */
#define L1394_SPEED_BETA 0x3
#define L1394_SPEED_800 0x3
#define L1394_SPEED_1600 0x4
#define L1394_SPEED_3200 0x5
#define L1394_SELFID_PWRCL_NO_POWER 0x0 #define L1394_SELFID_PWRCL_NO_POWER 0x0
#define L1394_SELFID_PWRCL_PROVIDE_15W 0x1 #define L1394_SELFID_PWRCL_PROVIDE_15W 0x1

10
src/raw1394.h
View File

@ -79,9 +79,13 @@ typedef struct raw1394_arm_request_response {
/* new ISO API */ /* new ISO API */
enum raw1394_iso_speed { enum raw1394_iso_speed {
RAW1394_ISO_SPEED_100 = 0, RAW1394_ISO_SPEED_100 = 0,
RAW1394_ISO_SPEED_200 = 1, RAW1394_ISO_SPEED_200 = 1,
RAW1394_ISO_SPEED_400 = 2, RAW1394_ISO_SPEED_400 = 2,
/* added in libraw1394 v2.1.0: */
RAW1394_ISO_SPEED_800 = 3,
RAW1394_ISO_SPEED_1600 = 4,
RAW1394_ISO_SPEED_3200 = 5,
}; };
/* The dma mode when receiving iso data. Must be supported by chipset */ /* The dma mode when receiving iso data. Must be supported by chipset */