greybus: update AP id service message

Rename and renumber the values for the AP ID service message
and related symbols to match the recently-updated spec.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
This commit is contained in:
Alex Elder 2014-10-22 05:36:18 -05:00 committed by Greg Kroah-Hartman
parent 65e50f95f1
commit 2d5e4fa9dc
2 changed files with 9 additions and 8 deletions

View File

@ -136,6 +136,9 @@ static void svc_management(struct svc_function_unipro_management *management,
}
switch (management->management_packet_type) {
case SVC_MANAGEMENT_AP_ID:
hd->device_id = management->ap_id.device_id;
break;
case SVC_MANAGEMENT_LINK_UP:
module = gb_module_find(hd, management->link_up.module_id);
if (!module) {
@ -152,9 +155,6 @@ static void svc_management(struct svc_function_unipro_management *management,
ret, management->link_up.module_id,
management->link_up.interface_id);
break;
case SVC_MANAGEMENT_AP_DEVICE_ID:
hd->device_id = management->ap_device_id.device_id;
break;
default:
dev_err(hd->parent, "Unhandled UniPro management message\n");
}

View File

@ -56,22 +56,23 @@ struct svc_function_unipro_link_up {
__u8 device_id;
};
struct svc_function_ap_device_id {
struct svc_function_ap_id {
__u8 module_id;
__u8 device_id;
};
enum svc_function_management_event {
SVC_MANAGEMENT_SET_ROUTE = 0x00,
SVC_MANAGEMENT_AP_ID = 0x00,
SVC_MANAGEMENT_LINK_UP = 0x01,
SVC_MANAGEMENT_AP_DEVICE_ID = 0x02,
SVC_MANAGEMENT_SET_ROUTE = 0x02,
};
struct svc_function_unipro_management {
__u8 management_packet_type; /* enum svc_function_management_event */
union {
struct svc_function_unipro_set_route set_route;
struct svc_function_ap_id ap_id;
struct svc_function_unipro_link_up link_up;
struct svc_function_ap_device_id ap_device_id;
struct svc_function_unipro_set_route set_route;
};
};