summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar aeb 2000-07-05 20:40:51 +0000
committerGravatar aeb 2000-07-05 20:40:51 +0000
commitc1e3916f704c82bfe6591ffd049c24015a8d1656 (patch)
tree404e2123c39c7260b00c58f640b8fbb9b1e63ce8
parent- Set library version info in configure.in, use in src/Makefile.am. (diff)
Added raw1394_reset_bus() call.
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@33 53a565d1-3bb7-0310-b661-cf11e63c67ab
-rw-r--r--NEWS4
-rw-r--r--src/kernel-raw1394.h1
-rw-r--r--src/main.c14
-rw-r--r--src/raw1394.h4
4 files changed, 23 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index eccf5d4..deca55f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
+Version 0.8:
+
+- new raw1394_reset_bus() function to reset the bus
+
Version 0.7:
- added support for environments where the kernel runs in 64 bit mode whereas
diff --git a/src/kernel-raw1394.h b/src/kernel-raw1394.h
index b0d8194..e496301 100644
--- a/src/kernel-raw1394.h
+++ b/src/kernel-raw1394.h
@@ -21,6 +21,7 @@
#define RAW1394_REQ_ISO_LISTEN 200
#define RAW1394_REQ_FCP_LISTEN 201
+#define RAW1394_REQ_RESET_BUS 202
/* kernel to user */
#define RAW1394_REQ_BUS_RESET 10000
diff --git a/src/main.c b/src/main.c
index 5a3c0f9..2e6d99f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -201,3 +201,17 @@ int raw1394_set_port(struct raw1394_handle *handle, int port)
return -1;
}
}
+
+int raw1394_reset_bus(struct raw1394_handle *handle)
+{
+ struct raw1394_request *req = &handle->req;
+
+ CLEAR_REQ(req);
+
+ req->type = RAW1394_REQ_RESET_BUS;
+ req->generation = handle->generation;
+
+ if (write(handle->fd, req, sizeof(*req)) < 0) return -1;
+
+ return 0;
+}
diff --git a/src/raw1394.h b/src/raw1394.h
index 2e38a4b..d95217e 100644
--- a/src/raw1394.h
+++ b/src/raw1394.h
@@ -65,6 +65,10 @@ int raw1394_get_port_info(raw1394handle_t handle, struct raw1394_portinfo *pinf,
*/
int raw1394_set_port(raw1394handle_t handle, int port);
+/*
+ * Reset the connected bus. Returns -1 for failure, 0 for success.
+ */
+int raw1394_reset_bus(raw1394handle_t handle);
/*
* Get one new message through handle and process it. See below for handler
itle='2003-03-26 22:48:46 +0000'>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 12-20 07:37:47 +0000'>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