From 03faa974455d4480908cbef7faaa8acf28b9b96e Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 30 Jun 2012 16:46:55 +0200 Subject: [PATCH] Add 1394b speed codes to 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 --- src/ieee1394.h | 5 +++++ src/raw1394.h | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ieee1394.h b/src/ieee1394.h index 96a8308..1423744 100644 --- a/src/ieee1394.h +++ b/src/ieee1394.h @@ -18,6 +18,11 @@ #define L1394_SPEED_100 0x0 #define L1394_SPEED_200 0x1 #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_PROVIDE_15W 0x1 diff --git a/src/raw1394.h b/src/raw1394.h index 788d682..e1e34a3 100644 --- a/src/raw1394.h +++ b/src/raw1394.h @@ -79,9 +79,13 @@ typedef struct raw1394_arm_request_response { /* new ISO API */ enum raw1394_iso_speed { - RAW1394_ISO_SPEED_100 = 0, - RAW1394_ISO_SPEED_200 = 1, - RAW1394_ISO_SPEED_400 = 2, + RAW1394_ISO_SPEED_100 = 0, + RAW1394_ISO_SPEED_200 = 1, + 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 */