summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Stefan Richter 2012-06-30 16:46:55 +0200
committerGravatar Stefan Richter 2012-06-30 16:46:55 +0200
commit03faa974455d4480908cbef7faaa8acf28b9b96e (patch)
tree28e972adb0614eb9d73eaa10a335ae54514a159c
parentFix documentation of raw1394_iso_multichannel_recv_init() (diff)
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>
-rw-r--r--src/ieee1394.h5
-rw-r--r--src/raw1394.h10
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 */
/span>Update Debian files.Gravatar bencollins 4-25/+73 2003-07-13Ok, the Debian package was way out of sync with upstreamGravatar bencollins 1-1/+1 2003-07-13Ooops...libtool works a bit different than I thought, but atleast it worksGravatar bencollins 2-6/+1 2003-07-13Generate and install the pdf in the Debian package.Gravatar bencollins 3-3/+4 2003-07-13Don't run configure at the end of autogen.sh. Also, remove autom4te.cache.Gravatar bencollins 1-1/+1 2003-07-13Update Debian maintainerGravatar bencollins 1-1/+2 2003-07-13Update Debian changelog.Gravatar bencollins 1-0/+8 2003-07-13File doesn't really seem needed. The NEWS file gives a good overview, andGravatar bencollins 1-4/+0 2003-07-13Fix compiler warnings.Gravatar bencollins 4-12/+22 2003-07-13Updates from 0.10.0 release.Gravatar bencollins 4-5/+14 2003-04-23add libtoolize to bootstrapGravatar ddennedy 1-1/+10 2003-04-21added Dan Maas' rawiso docsGravatar ddennedy 1-32/+295 2003-04-07new_handle_on_port() error path fix from Jim RadfordGravatar dmaas 1-1/+3 2003-03-26add raw1394_new_handle_on_port() convenience functionGravatar dmaas 2-1/+41 2003-02-22Updates for new rawiso ioctl interface.Gravatar bencollins 3-37/+125 2003-01-15add iso_xmit_sync() and iso_xmit_write(); clean up iso handling a bitGravatar dmaas 5-39/+161 2003-01-15implement tag matching for rawiso receptionGravatar dmaas 3-4/+12 2003-01-06back out previous commit - don't drop the legacy API just yetGravatar dmaas 6-173/+130 2003-01-05emulate legacy ISO reception API on top of new rawiso APIGravatar dmaas 7-131/+174 2002-12-24update iso API for multi-channel reception and new packet buffer layoutGravatar dmaas 4-123/+236 2002-12-20oops, irq_interval needs to be signedGravatar anonymous 1-1/+1 2002-12-20dmaas - renamed exported arm definitions into the raw1394_ namespace; brought...Gravatar anonymous 3-124/+48 2002-12-16rawiso updates:Gravatar dmaas 3-18/+25 2002-11-18fix cplusplus extern C blockGravatar ddennedy 1-4/+4 2002-11-18merged rawiso branchGravatar ddennedy 7-6/+488