diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-21 22:17:47 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-21 22:17:47 -0500 |
| commit | 39d0ded894259789f1524d6097b81052bafb9f58 (patch) | |
| tree | 64d3827eee239b85d54ae62e6e719402fef0a555 /include/linux/mailbox_client.h | |
| parent | 8637c1da33ee7150c77bfd800d22a993979c4903 (diff) | |
| parent | 35fe1a70140269da083f3b64d459a4b0dba83608 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsklsk-v3.10-14.08
Diffstat (limited to 'include/linux/mailbox_client.h')
| -rw-r--r-- | include/linux/mailbox_client.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h index 955f3d7641e8..307d9cab2026 100644 --- a/include/linux/mailbox_client.h +++ b/include/linux/mailbox_client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Linaro Ltd. + * Copyright (C) 2013-2014 Linaro Ltd. * Author: Jassi Brar <jassisinghbrar@gmail.com> * * This program is free software; you can redistribute it and/or modify @@ -11,36 +11,36 @@ #define __MAILBOX_CLIENT_H #include <linux/of.h> +#include <linux/device.h> struct mbox_chan; /** * struct mbox_client - User of a mailbox * @dev: The client device - * @chan_name: The "controller:channel" this client wants - * @rx_callback: Atomic callback to provide client the data received - * @tx_done: Atomic callback to tell client of data transmission * @tx_block: If the mbox_send_message should block until data is * transmitted. * @tx_tout: Max block period in ms before TX is assumed failure - * @knows_txdone: if the client could run the TX state machine. Usually + * @knows_txdone: If the client could run the TX state machine. Usually * if the client receives some ACK packet for transmission. * Unused if the controller already has TX_Done/RTR IRQ. + * @rx_callback: Atomic callback to provide client the data received + * @tx_done: Atomic callback to tell client of data transmission */ struct mbox_client { struct device *dev; - const char *chan_name; - void (*rx_callback)(struct mbox_client *cl, void *mssg); - void (*tx_done)(struct mbox_client *cl, void *mssg, int r); bool tx_block; unsigned long tx_tout; bool knows_txdone; + + void (*rx_callback)(struct mbox_client *cl, void *mssg); + void (*tx_done)(struct mbox_client *cl, void *mssg, int r); }; -struct mbox_chan *mbox_request_channel(struct mbox_client *cl); +struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index); int mbox_send_message(struct mbox_chan *chan, void *mssg); -void mbox_client_txdone(struct mbox_chan *chan, int r); -bool mbox_client_peek_data(struct mbox_chan *chan); -void mbox_free_channel(struct mbox_chan *chan); +void mbox_client_txdone(struct mbox_chan *chan, int r); /* atomic */ +bool mbox_client_peek_data(struct mbox_chan *chan); /* atomic */ +void mbox_free_channel(struct mbox_chan *chan); /* may sleep */ #endif /* __MAILBOX_CLIENT_H */ |