diff options
author | Ian Molton <ian.molton@collabora.co.uk> | 2009-12-01 01:47:32 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 01:47:32 -0500 |
commit | 9996508b3353063f2d6c48c1a28a84543d72d70b (patch) | |
tree | 4358f990cf7805caee70be90953b4d267aad5461 /include/linux/hw_random.h | |
parent | 2f32bfd834d5d7eb230bcbf39aaacccd2a01d767 (diff) |
hwrng: core - Replace u32 in driver API with byte array
This patch implements a new method by which hw_random hardware drivers
can pass data to the core more efficiently, using a shared buffer.
The old methods have been retained as a compatability layer until all the
drivers have been updated.
Signed-off-by: Ian Molton <ian.molton@collabora.co.uk>
Acked-by: Matt Mackall <mpm@selenic.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/hw_random.h')
-rw-r--r-- | include/linux/hw_random.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h index 7244456e7e65..9bede7633f74 100644 --- a/include/linux/hw_random.h +++ b/include/linux/hw_random.h | |||
@@ -22,10 +22,12 @@ | |||
22 | * @cleanup: Cleanup callback (can be NULL). | 22 | * @cleanup: Cleanup callback (can be NULL). |
23 | * @data_present: Callback to determine if data is available | 23 | * @data_present: Callback to determine if data is available |
24 | * on the RNG. If NULL, it is assumed that | 24 | * on the RNG. If NULL, it is assumed that |
25 | * there is always data available. | 25 | * there is always data available. *OBSOLETE* |
26 | * @data_read: Read data from the RNG device. | 26 | * @data_read: Read data from the RNG device. |
27 | * Returns the number of lower random bytes in "data". | 27 | * Returns the number of lower random bytes in "data". |
28 | * Must not be NULL. | 28 | * Must not be NULL. *OSOLETE* |
29 | * @read: New API. drivers can fill up to max bytes of data | ||
30 | * into the buffer. The buffer is aligned for any type. | ||
29 | * @priv: Private data, for use by the RNG driver. | 31 | * @priv: Private data, for use by the RNG driver. |
30 | */ | 32 | */ |
31 | struct hwrng { | 33 | struct hwrng { |
@@ -34,6 +36,7 @@ struct hwrng { | |||
34 | void (*cleanup)(struct hwrng *rng); | 36 | void (*cleanup)(struct hwrng *rng); |
35 | int (*data_present)(struct hwrng *rng, int wait); | 37 | int (*data_present)(struct hwrng *rng, int wait); |
36 | int (*data_read)(struct hwrng *rng, u32 *data); | 38 | int (*data_read)(struct hwrng *rng, u32 *data); |
39 | int (*read)(struct hwrng *rng, void *data, size_t max, bool wait); | ||
37 | unsigned long priv; | 40 | unsigned long priv; |
38 | 41 | ||
39 | /* internal. */ | 42 | /* internal. */ |