For consistency, rename the symbols add_device and remove_device
to device_add and device_remove.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
{
client->n_devices++;
client->devices = talloc_realloc(client, client->devices,
{
client->n_devices++;
client->devices = talloc_realloc(client, client->devices,
client->devices[client->n_devices - 1] = device;
talloc_steal(client, device);
client->devices[client->n_devices - 1] = device;
talloc_steal(client, device);
- client->ops.add_device(device, client->ops.cb_arg);
+ client->ops.device_add(device, client->ops.cb_arg);
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
{
struct device *device = NULL;
int i;
{
struct device *device = NULL;
int i;
struct device *, client->n_devices);
/* notify the UI */
struct device *, client->n_devices);
/* notify the UI */
- client->ops.remove_device(device, client->ops.cb_arg);
+ client->ops.device_remove(device, client->ops.cb_arg);
- add_device(client, dev);
+ device_add(client, dev);
break;
case PB_PROTOCOL_ACTION_REMOVE:
dev_id = pb_protocol_deserialise_string(client, message);
break;
case PB_PROTOCOL_ACTION_REMOVE:
dev_id = pb_protocol_deserialise_string(client, message);
pb_log("%s: no device id?\n", __func__);
return 0;
}
pb_log("%s: no device id?\n", __func__);
return 0;
}
- remove_device(client, dev_id);
+ device_remove(client, dev_id);
break;
default:
pb_log("%s: unknown action %d\n", __func__, message->action);
break;
default:
pb_log("%s: unknown action %d\n", __func__, message->action);
/**
* struct discover_client_ops - Application supplied client info.
/**
* struct discover_client_ops - Application supplied client info.
- * @add_device: PB_PROTOCOL_ACTION_ADD event callback.
- * @remove_device: PB_PROTOCOL_ACTION_REMOVE event callback.
+ * @device_add: PB_PROTOCOL_ACTION_ADD event callback.
+ * @device_remove: PB_PROTOCOL_ACTION_REMOVE event callback.
* @cb_arg: Client managed convenience variable passed to callbacks.
*/
struct discover_client_ops {
* @cb_arg: Client managed convenience variable passed to callbacks.
*/
struct discover_client_ops {
- int (*add_device)(const struct device *device, void *arg);
- void (*remove_device)(const struct device *device, void *arg);
+ int (*device_add)(const struct device *device, void *arg);
+ void (*device_remove)(const struct device *device, void *arg);
/**
* Process data from the server.
*
/**
* Process data from the server.
*
- * Will read from the client socket, and call add_device on any discovered
+ * Will read from the client socket, and call device_add on any discovered
}
static struct discover_client_ops client_ops = {
}
static struct discover_client_ops client_ops = {
- .add_device = print_device_add,
- .remove_device = print_device_remove,
+ .device_add = print_device_add,
+ .device_remove = print_device_remove,
twin_window_queue_paint(pboot_spane->window);
}
twin_window_queue_paint(pboot_spane->window);
}
-int pboot_add_device(const char *dev_id, const char *name,
+int pboot_device_add(const char *dev_id, const char *name,
twin_pixmap_t *pixmap)
{
int index;
twin_pixmap_t *pixmap)
{
int index;
-int pboot_remove_device(const char *dev_id)
+int pboot_device_remove(const char *dev_id)
{
pboot_device_t *dev = NULL;
int i, newsel = pboot_dev_sel;
{
pboot_device_t *dev = NULL;
int i, newsel = pboot_dev_sel;