Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34fae58 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman
Browse files

greybus: operation: Move operation header to greybus_protocols.h 



This should be exposed to external users (like gbsim). Move it to
greybus_protocols.h.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f47c1b02

drivers/staging/greybus/greybus_protocols.h

+30 −1
Original line number Diff line number Diff line
@@ -69,9 +69,38 @@ 
#define GB_CONTROL_CPORT_ID			2





/* Control Protocol */

/*

 * All operation messages (both requests and responses) begin with

 * a header that encodes the size of the message (header included).

 * This header also contains a unique identifier, that associates a

 * response message with its operation.  The header contains an

 * operation type field, whose interpretation is dependent on what

 * type of protocol is used over the connection.  The high bit

 * (0x80) of the operation type field is used to indicate whether

 * the message is a request (clear) or a response (set).

 *

 * Response messages include an additional result byte, which

 * communicates the result of the corresponding request.  A zero

 * result value means the operation completed successfully.  Any

 * other value indicates an error; in this case, the payload of the

 * response message (if any) is ignored.  The result byte must be

 * zero in the header for a request message.

 *

 * The wire format for all numeric fields in the header is little

 * endian.  Any operation-specific data begins immediately after the

 * header.

 */

struct gb_operation_msg_hdr {

	__le16	size;		/* Size in bytes of header + payload */

	__le16	operation_id;	/* Operation unique id */

	__u8	type;		/* E.g GB_I2C_TYPE_* or GB_GPIO_TYPE_* */

	__u8	result;		/* Result of request (in responses only) */

	__u8	pad[2];		/* must be zero (ignore when read) */

};





/* Control Protocol */



/* version request has no payload */

struct gb_protocol_version_response {

	__u8	major;

drivers/staging/greybus/operation.h

+0 −29
Original line number Diff line number Diff line
@@ -43,35 +43,6 @@ enum gb_operation_result { 
	GB_OP_MALFUNCTION	= 0xff,

};



/*

 * All operation messages (both requests and responses) begin with

 * a header that encodes the size of the message (header included).

 * This header also contains a unique identifier, that associates a

 * response message with its operation.  The header contains an

 * operation type field, whose interpretation is dependent on what

 * type of protocol is used over the connection.  The high bit

 * (0x80) of the operation type field is used to indicate whether

 * the message is a request (clear) or a response (set).

 *

 * Response messages include an additional result byte, which

 * communicates the result of the corresponding request.  A zero

 * result value means the operation completed successfully.  Any

 * other value indicates an error; in this case, the payload of the

 * response message (if any) is ignored.  The result byte must be

 * zero in the header for a request message.

 *

 * The wire format for all numeric fields in the header is little

 * endian.  Any operation-specific data begins immediately after the

 * header.

 */

struct gb_operation_msg_hdr {

	__le16	size;		/* Size in bytes of header + payload */

	__le16	operation_id;	/* Operation unique id */

	__u8	type;		/* E.g GB_I2C_TYPE_* or GB_GPIO_TYPE_* */

	__u8	result;		/* Result of request (in responses only) */

	__u8	pad[2];		/* must be zero (ignore when read) */

};



#define GB_OPERATION_MESSAGE_SIZE_MIN	sizeof(struct gb_operation_msg_hdr)

#define GB_OPERATION_MESSAGE_SIZE_MAX	U16_MAX