commit 67b6f90d542ae7e20d7d7586fa4449bf4c10a13c
author Andrew Walbran <qwandor@google.com> Thu Mar 15 15:53:19 2018 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Mar 16 10:46:00 2018 +0000
tree 00ba74befc93cfbd4d5acbda756e311433a4e1f2
parent 79b69447c6eb7f1b574a0e8021fb58a8a30eb60e

[ddk] Remove references to iotxn.

Change-Id: Ib460c12cb2a497db3090c76e1d14ff580ee9fd4c

docs/ddk/device-ops.md

diff --git a/docs/ddk/device-ops.md b/docs/ddk/device-ops.md
index 2f198bb..54fce53 100644
--- a/docs/ddk/device-ops.md
+++ b/docs/ddk/device-ops.md
@@ -103,8 +103,7 @@
 data becomes available `device_state_set(DEVICE_STATE_READABLE)` may be used to
 signal waiting clients.
 
-This hook **must not block**.  Use `iotxn_queue` to handle IO which
-requires processing and delayed status.
+This hook **must not block**.
 
 The default read implementation returns **ZX_ERR_NOT_SUPPORTED**.
 
@@ -123,8 +122,7 @@
 be returned and when it is again possible to write,
 `device_state_set(DEVICE_STATE_WRITABLE)` may be used to signal waiting clients.
 
-This hook **must not block**.  Use `iotxn_queue` to handle IO which
-requires processing and delayed status.
+This hook **must not block**.
 
 The default write implementation returns **ZX_ERR_NOT_SUPPORTED**.
 
@@ -133,26 +131,6 @@
                      zx_off_t off, size_t* actual);
 ```
 
-## iotxn_queue
-The iotxn_queue hook is the core mechanism for asynchronous IO.  A driver that
-implements iotxn_queue should not implement read or write, as iotxn_queue takes
-precedence over them.
-
-The iotxn_queue hook may not block.  It is expected to start the IO operation
-and return immediately, having taken ownership of *txn*.
-
-When the operation succeeds or fails, the completion callback on *txn* must be
-called to finish the operation.  If the request is invalid, the completion
-callback may be called from within the iotxn_queue hook.  Otherwise it is
-usually called from an irq handler or worker thread that observes the success
-or failure of the requested IO operation.
-
-There is no default iotxn_queue implementation.
-
-```
-void (*iotxn_queue)(void* ctx, iotxn_t* txn);
-```
-
 ## get_size
 If the device is seekable, the get_size hook should return the size of the device.
 
@@ -166,7 +144,7 @@
 ## ioctl
 The ioctl hook allows support for device-specific operations.
 
-These, like read, write, and iotxn_queue, must not block.
+These, like read and write, must not block.
 
 On success, **ZX_OK** must be returned and *out_actual* must be set
 to the number of output bytes provided (0 if none).

system/ulib/ddk/include/ddk/device.h

diff --git a/system/ulib/ddk/include/ddk/device.h b/system/ulib/ddk/include/ddk/device.h
index 138ec61..69faa29 100644
--- a/system/ulib/ddk/include/ddk/device.h
+++ b/system/ulib/ddk/include/ddk/device.h
@@ -135,8 +135,7 @@
     // data becomes available `device_state_set(DEVICE_STATE_READABLE)` may be used to
     // signal waiting clients.
     //
-    // This hook **must not block**.  Use `iotxn_queue` to handle IO which
-    // requires processing and delayed status.
+    // This hook **must not block**.
     //
     // The default read implementation returns **ZX_ERR_NOT_SUPPORTED**.
     //
@@ -153,8 +152,7 @@
     // be returned and when it is again possible to write,
     // `device_state_set(DEVICE_STATE_WRITABLE)` may be used to signal waiting clients.
     //
-    // This hook **must not block**.  Use `iotxn_queue` to handle IO which
-    // requires processing and delayed status.
+    // This hook **must not block**.
     //
     // The default write implementation returns **ZX_ERR_NOT_SUPPORTED**.
     //
@@ -172,7 +170,7 @@
     //@ ## ioctl
     // The ioctl hook allows support for device-specific operations.
     //
-    // These, like read, write, and iotxn_queue, must not block.
+    // These, like read and write, must not block.
     //
     // On success, **ZX_OK** must be returned and *out_actual* must be set
     // to the number of output bytes provided (0 if none).