diff options
Diffstat (limited to 'ui/twin')
-rw-r--r-- | ui/twin/main-generic.c | 6 | ||||
-rw-r--r-- | ui/twin/pbt-client.c | 12 | ||||
-rw-r--r-- | ui/twin/pbt-client.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c index 28a96e4..517422e 100644 --- a/ui/twin/main-generic.c +++ b/ui/twin/main-generic.c @@ -199,7 +199,7 @@ fail_menu: return NULL; } -static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data) +static int boot_cb(struct pbt_client *client, struct pb_opt_data *opt_data) { int result; @@ -207,7 +207,7 @@ static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data) pb_log("%s: %s\n", __func__, opt_data->name); - result = pb_run_kexec(opt_data->bd, client->dry_run); + result = pb_boot(opt_data->bd, client->dry_run); return result; } @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - client = pbt_client_init(opts.backend, 1024, 640, kexec_cb, + client = pbt_client_init(opts.backend, 1024, 640, boot_cb, opts.start_daemon, opts.dry_run); if (!client) { diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index 39facf5..ad418a3 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -52,7 +52,7 @@ void pbt_frame_status_printf(struct pbt_frame *frame, const char *format, ...) va_end(ap); } -static int pbt_client_run_kexec(struct pbt_item *item) +static int pbt_client_boot(struct pbt_item *item) { int result; struct pb_opt_data *opt_data = pbt_opt_data_from_item(item); @@ -62,8 +62,8 @@ static int pbt_client_run_kexec(struct pbt_item *item) pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...", pbt_item_name(item)); - assert(item->pbt_client->kexec_cb); - result = item->pbt_client->kexec_cb(item->pbt_client, opt_data); + assert(item->pbt_client->boot_cb); + result = item->pbt_client->boot_cb(item->pbt_client, opt_data); if (!result) { sleep(item->pbt_client->dry_run ? 1 : 60); @@ -140,7 +140,7 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client) i->pb_opt = opt; i->pbt_client = client; - i->on_execute = pbt_client_run_kexec; + i->on_execute = pbt_client_boot; i->on_edit = pbt_client_on_edit; i->data = opt_data = talloc(i, struct pb_opt_data); @@ -265,7 +265,7 @@ static void pbt_client_destructor(struct pbt_client *client) struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, unsigned int width, unsigned int height, - int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *), + int (*boot_cb)(struct pbt_client *, struct pb_opt_data *), int start_deamon, int dry_run) { struct pbt_client *pbt_client; @@ -284,7 +284,7 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, pbt_client->waitset = waitset_create(pbt_client); pbt_client->sig = "pbt_client"; - pbt_client->kexec_cb = kexec_cb; + pbt_client->boot_cb = boot_cb; pbt_client->dry_run = dry_run; pbt_client->frame.scr = pbt_scr_init(pbt_client, pbt_client->waitset, backend, width, height, NULL, NULL); diff --git a/ui/twin/pbt-client.h b/ui/twin/pbt-client.h index 6c35920..7e74e4e 100644 --- a/ui/twin/pbt-client.h +++ b/ui/twin/pbt-client.h @@ -45,7 +45,7 @@ struct pbt_client { int dry_run; struct pb_signal_data signal_data; void *client_data; - int (*kexec_cb)(struct pbt_client *pbt_client, struct pb_opt_data *pod); + int (*boot_cb)(struct pbt_client *pbt_client, struct pb_opt_data *pod); struct pbt_frame frame; struct discover_client *discover_client; @@ -54,7 +54,7 @@ struct pbt_client { struct pbt_client *pbt_client_init(enum pbt_twin_backend backend, unsigned int width, unsigned int height, - int (*kexec_cb)(struct pbt_client *, struct pb_opt_data *), + int (*boot_cb)(struct pbt_client *, struct pb_opt_data *), int start_deamon, int dry_run); void pbt_client_destroy(struct pbt_client *client); void pbt_client_resize(struct pbt_client *client); |