From: Bryan O'Donoghue Date: Mon, 13 Jul 2015 19:20:45 +0000 (+0100) Subject: greybus: loopback: Move loopback operation definitions X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9f971a2e5b5094cf12480976fb1765376414eac;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git greybus: loopback: Move loopback operation definitions In order to have one point of type definition for gbsim move the loopback operation definitions to greybus_protocols.h. Signed-off-by: Bryan O'Donoghue Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h index 498f6e9f44d2..9823d16c3b40 100644 --- a/drivers/staging/greybus/greybus_protocols.h +++ b/drivers/staging/greybus/greybus_protocols.h @@ -657,6 +657,27 @@ struct gb_uart_serial_state_request { __u8 control; }; +/* Loopback */ + +/* Version of the Greybus loopback protocol we support */ +#define GB_LOOPBACK_VERSION_MAJOR 0x00 +#define GB_LOOPBACK_VERSION_MINOR 0x01 + +/* Greybus loopback request types */ +#define GB_LOOPBACK_TYPE_INVALID 0x00 +#define GB_LOOPBACK_TYPE_PROTOCOL_VERSION 0x01 +#define GB_LOOPBACK_TYPE_PING 0x02 +#define GB_LOOPBACK_TYPE_TRANSFER 0x03 + +struct gb_loopback_transfer_request { + __le32 len; + __u8 data[0]; +}; + +struct gb_loopback_transfer_response { + __u8 data[0]; +}; + /* SDIO */ /* Version of the Greybus sdio protocol we support */ #define GB_SDIO_VERSION_MAJOR 0x00 diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index eeec3323ad6d..59c437bdd58c 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -45,16 +45,6 @@ struct gb_loopback { u32 error; }; -/* Version of the Greybus loopback protocol we support */ -#define GB_LOOPBACK_VERSION_MAJOR 0x00 -#define GB_LOOPBACK_VERSION_MINOR 0x01 - -/* Greybus loopback request types */ -#define GB_LOOPBACK_TYPE_INVALID 0x00 -#define GB_LOOPBACK_TYPE_PROTOCOL_VERSION 0x01 -#define GB_LOOPBACK_TYPE_PING 0x02 -#define GB_LOOPBACK_TYPE_TRANSFER 0x03 - /* Current function (type of traffic generated by the loopback thread) */ #define GB_LOOPBACK_FN_NONE 0x00 #define GB_LOOPBACK_FN_PING 0x01 @@ -175,16 +165,6 @@ static struct attribute *loopback_attrs[] = { }; ATTRIBUTE_GROUPS(loopback); -struct gb_loopback_transfer_request { - __le32 len; - __u8 data[0]; -}; - -struct gb_loopback_transfer_response { - __u8 data[0]; -}; - - static int gb_loopback_transfer(struct gb_loopback *gb, struct timeval *tping, u32 len) {