diff options
| author |  aeb
| 2001-05-14 01:05:58 +0000 |
|---|---|---|
| committer | aeb
| 2001-05-14 01:05:58 +0000 |
| commit | e02dee488a2c3c3ea8374e7bd49e59176eab32dd (patch) | |
| tree | aacc99ac9584e29b2477db7acc3f5e27d54803c3 /src/eventloop.c | |
| parent | Fix macros so that they actually work. (diff) | |
Handle generation number is not automatically advanced with bus reset.
Function raw1394_update_generation() added for manual update.
Bus reset handler get current generation number as argument.
Default bus reset handler calls raw1394_update_generation().
git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@60 53a565d1-3bb7-0310-b661-cf11e63c67ab
Diffstat (limited to 'src/eventloop.c')
| -rw-r--r-- | src/eventloop.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/eventloop.c b/src/eventloop.c index 7f1f519..f3a8f7c 100644 --- a/src/eventloop.c +++ b/src/eventloop.c @@ -28,8 +28,6 @@ int raw1394_loop_iterate(struct raw1394_handle *handle) switch (req->type) { case RAW1394_REQ_BUS_RESET: - handle->generation = req->generation; - if (handle->protocol_version == 3) { handle->num_of_nodes = req->misc & 0xffff; handle->local_id = req->misc >> 16; @@ -40,7 +38,8 @@ int raw1394_loop_iterate(struct raw1394_handle *handle) } if (handle->bus_reset_handler) { - retval = handle->bus_reset_handler(handle); + retval = handle->bus_reset_handler(handle, + req->generation); } break; |