X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=ae3d7c6d9741da102655850700b7b534b894fd94;hp=b9d8d79048639300b6d4d7667983be7b463627ed;hb=1b0b59295d0500764c5096753f7cd11bf3ab5df4;hpb=f4c558294089f7449e6f536300ddd1aa94d2cf20

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index b9d8d79..ae3d7c6 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -70,19 +70,19 @@ static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
 	char *name;
 
 	assert(cod->name);
-	assert(cod->kd);
+	assert(cod->bd);
 
 	name = talloc_asprintf(i, "%s:", cod->name);
 
-	if (cod->kd->image)
-		name = talloc_asprintf_append(name, " %s", cod->kd->image);
+	if (cod->bd->image)
+		name = talloc_asprintf_append(name, " %s", cod->bd->image);
 
-	if (cod->kd->initrd)
+	if (cod->bd->initrd)
 		name = talloc_asprintf_append(name, " initrd=%s",
-			cod->kd->initrd);
+			cod->bd->initrd);
 
-	if (cod->kd->args)
-		name = talloc_asprintf_append(name, " %s", cod->kd->args);
+	if (cod->bd->args)
+		name = talloc_asprintf_append(name, " %s", cod->bd->args);
 
 	DBGS("@%s@\n", name);
 	return name;
@@ -125,24 +125,24 @@ int cui_run_cmd(struct pmenu_item *item)
 }
 
 /**
- * cui_run_kexec - A generic cb to run kexec.
+ * cui_boot - A generic cb to run kexec.
  */
 
-static int cui_run_kexec(struct pmenu_item *item)
+static int cui_boot(struct pmenu_item *item)
 {
 	int result;
 	struct cui *cui = cui_from_item(item);
 	struct cui_opt_data *cod = cod_from_item(item);
 
 	assert(cui->current == &cui->main->scr);
-	assert(cui->on_kexec);
+	assert(cui->on_boot);
 
 	pb_log("%s: %s\n", __func__, cod->name);
 	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
 	def_prog_mode();
 
-	result = cui->on_kexec(cui, cod);
+	result = cui->on_boot(cui, cod);
 
 	reset_prog_mode();
 	redrawwin(cui->current->main_ncw);
@@ -154,31 +154,31 @@ static int cui_run_kexec(struct pmenu_item *item)
 		sleep(cui->dry_run ? 1 : 60);
 	}
 
-	pb_log("%s: failed: %s\n", __func__, cod->kd->image);
-	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->kd->image);
+	pb_log("%s: failed: %s\n", __func__, cod->bd->image);
+	nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->bd->image);
 
 	return 0;
 }
 
 /**
- * cui_ked_on_exit - The ked on_exit callback.
+ * cui_boot_editor_on_exit - The boot_editor on_exit callback.
  */
 
-static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
-	struct pb_kexec_data *kd)
+static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
+	struct pb_boot_data *bd)
 {
-	struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
+	struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
 
-	if (ked_result == ked_update) {
+	if (boot_editor_result == boot_editor_update) {
 		struct pmenu_item *i = pmenu_find_selected(cui->main);
 		struct cui_opt_data *cod = cod_from_item(i);
 		char *name;
 
-		assert(kd);
+		assert(bd);
 
-		talloc_steal(i, kd);
-		talloc_free(cod->kd);
-		cod->kd = kd;
+		talloc_steal(i, bd);
+		talloc_free(cod->bd);
+		cod->bd = bd;
 
 		name = cui_make_item_name(i, cod);
 		pmenu_item_replace(i, name);
@@ -187,24 +187,24 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
 		set_current_item(cui->main->ncm, i->nci);
 
 		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
-		pb_log(" image  '%s'\n", cod->kd->image);
-		pb_log(" initrd '%s'\n", cod->kd->initrd);
-		pb_log(" args   '%s'\n", cod->kd->args);
+		pb_log(" image  '%s'\n", cod->bd->image);
+		pb_log(" initrd '%s'\n", cod->bd->initrd);
+		pb_log(" args   '%s'\n", cod->bd->args);
 	}
 
 	cui_set_current(cui, &cui->main->scr);
 
-	talloc_free(ked);
+	talloc_free(boot_editor);
 }
 
-int cui_ked_run(struct pmenu_item *item)
+int cui_boot_editor_run(struct pmenu_item *item)
 {
 	struct cui *cui = cui_from_item(item);
 	struct cui_opt_data *cod = cod_from_item(item);
-	struct ked *ked;
+	struct boot_editor *boot_editor;
 
-	ked = ked_init(cui, cod->kd, cui_ked_on_exit);
-	cui_set_current(cui, &ked->scr);
+	boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
+	cui_set_current(cui, &boot_editor->scr);
 
 	return 0;
 }
@@ -340,12 +340,12 @@ void cui_on_open(struct pmenu *menu)
 	insert_pt = pmenu_grow(menu, 1);
 	i = pmenu_item_alloc(menu);
 
-	i->on_edit = cui_ked_run;
-	i->on_execute = cui_run_kexec;
+	i->on_edit = cui_boot_editor_run;
+	i->on_execute = cui_boot;
 	i->data = cod = talloc_zero(i, struct cui_opt_data);
 
 	cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
-	cod->kd = talloc_zero(i, struct pb_kexec_data);
+	cod->bd = talloc_zero(i, struct pb_boot_data);
 
 	pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
 
@@ -406,19 +406,19 @@ static int cui_device_add(struct device *dev, void *arg)
 
 		opt->ui_info = i = pmenu_item_alloc(cui->main);
 
-		i->on_edit = cui_ked_run;
-		i->on_execute = cui_run_kexec;
+		i->on_edit = cui_boot_editor_run;
+		i->on_execute = cui_boot;
 		i->data = cod = talloc(i, struct cui_opt_data);
 
 		cod->dev = dev;
 		cod->opt = opt;
 		cod->opt_hash = pb_opt_hash(dev, opt);
 		cod->name = opt->name;
-		cod->kd = talloc(i, struct pb_kexec_data);
+		cod->bd = talloc(i, struct pb_boot_data);
 
-		cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file);
-		cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file);
-		cod->kd->args = talloc_strdup(cod->kd, opt->boot_args);
+		cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
+		cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+		cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
 
 		name = cui_make_item_name(i, cod);
 		pmenu_item_setup(cui->main, i, insert_pt, name);
@@ -426,9 +426,9 @@ static int cui_device_add(struct device *dev, void *arg)
 		insert_pt++;
 
 		pb_log("%s: adding opt '%s'\n", __func__, cod->name);
-		pb_log("   image  '%s'\n", cod->kd->image);
-		pb_log("   initrd '%s'\n", cod->kd->initrd);
-		pb_log("   args   '%s'\n", cod->kd->args);
+		pb_log("   image  '%s'\n", cod->bd->image);
+		pb_log("   initrd '%s'\n", cod->bd->initrd);
+		pb_log("   args   '%s'\n", cod->bd->args);
 
 		/* If this is the default_item select it and start timer. */
 
@@ -533,7 +533,7 @@ static struct discover_client_ops cui_client_ops = {
  */
 
 struct cui *cui_init(void* platform_info,
-	int (*on_kexec)(struct cui *, struct cui_opt_data *),
+	int (*on_boot)(struct cui *, struct cui_opt_data *),
 	int (*js_map)(const struct js_event *e), int start_deamon, int dry_run)
 {
 	struct cui *cui;
@@ -550,9 +550,10 @@ struct cui *cui_init(void* platform_info,
 
 	cui->c_sig = pb_cui_sig;
 	cui->platform_info = platform_info;
-	cui->on_kexec = on_kexec;
+	cui->on_boot = on_boot;
 	cui->timer.handle_timeout = cui_handle_timeout;
 	cui->dry_run = dry_run;
+	cui->waitset = waitset_create(cui);
 
 	/* Loop here for scripts that just started the server. */
 
@@ -595,18 +596,19 @@ retry_start:
 	atexit(nc_atexit);
 	nc_start();
 
-	waiter_register(discover_client_get_fd(client), WAIT_IN,
-		cui_client_process_socket, client);
+	waiter_register(cui->waitset, discover_client_get_fd(client), WAIT_IN,
+			cui_client_process_socket, client);
 
-	waiter_register(STDIN_FILENO, WAIT_IN, cui_process_key, cui);
+	waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
+			cui_process_key, cui);
 
 	if (js_map) {
 
 		cui->pjs = pjs_init(cui, js_map);
 
 		if (cui->pjs)
-			waiter_register(pjs_get_fd(cui->pjs), WAIT_IN,
-				cui_process_js, cui);
+			waiter_register(cui->waitset, pjs_get_fd(cui->pjs),
+					WAIT_IN, cui_process_js, cui);
 	}
 
 	return cui;
@@ -638,7 +640,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
 	cui->current->post(cui->current);
 
 	while (1) {
-		int result = waiter_poll();
+		int result = waiter_poll(cui->waitset);
 
 		if (result < 0 && errno != EINTR) {
 			pb_log("%s: poll: %s\n", __func__, strerror(errno));