X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftest%2Fdiscover-test.c;h=faf1d893677936fc9307b9329df8244ee33260d2;hp=ae43b1e524b30421e694ed4fee4d04dcb309a8b3;hb=84a286992f5c2d100583686a84d533c3e1256562;hpb=9939af2652ce479645eaa78e891ee06f33845a99;ds=sidebyside

diff --git a/ui/test/discover-test.c b/ui/test/discover-test.c
index ae43b1e..faf1d89 100644
--- a/ui/test/discover-test.c
+++ b/ui/test/discover-test.c
@@ -3,6 +3,21 @@
 
 #include "ui/common/discover-client.h"
 
+static const char *device_type_string(enum device_type type)
+{
+	switch (type) {
+	case DEVICE_TYPE_DISK:
+		return "disk";
+	case DEVICE_TYPE_NETWORK:
+		return "network";
+	case DEVICE_TYPE_OPTICAL:
+		return "optical";
+	case DEVICE_TYPE_UNKNOWN:
+		return "unknown";
+	}
+	return "invalid";
+}
+
 static int print_device_add(struct device *device,
 	void __attribute__((unused)) *arg)
 {
@@ -10,6 +25,7 @@ static int print_device_add(struct device *device,
 
 	printf("new device:\n");
 	printf("\tid:   %s\n", device->id);
+	printf("\ttype: %s\n", device_type_string(device->type));
 	printf("\tname: %s\n", device->name);
 	printf("\tdesc: %s\n", device->description);
 	printf("\ticon: %s\n", device->icon_file);
@@ -22,12 +38,31 @@ static int print_device_add(struct device *device,
 		printf("\t\ticon: %s\n", opt->icon_file);
 		printf("\t\tboot: %s\n", opt->boot_image_file);
 		printf("\t\tinit: %s\n", opt->initrd_file);
+		printf("\t\tdtb:  %s\n", opt->dtb_file);
 		printf("\t\targs: %s\n", opt->boot_args);
 	}
 
 	return 0;
 }
 
+static int print_boot_option_add(struct device *dev,
+		struct boot_option *opt,
+		void __attribute__((unused)) *arg)
+{
+	printf("new boot option (dev: %s):\n", dev->id);
+	printf("\tdev id: %s\n", opt->device_id);
+	printf("\tid:     %s\n", opt->id);
+	printf("\tname:   %s\n", opt->name);
+	printf("\tdesc:   %s\n", opt->description);
+	printf("\ticon:   %s\n", opt->icon_file);
+	printf("\tboot:   %s\n", opt->boot_image_file);
+	printf("\tinit:   %s\n", opt->initrd_file);
+	printf("\targs:   %s\n", opt->boot_args);
+	printf("\tdefault:%d\n", opt->is_default);
+
+	return 0;
+}
+
 static void print_device_remove(struct device *device,
 	void __attribute__((unused)) *arg)
 {
@@ -36,9 +71,22 @@ static void print_device_remove(struct device *device,
 	printf("\tname: %s\n", device->name);
 }
 
+static void print_status(struct boot_status *status,
+	void __attribute__((unused)) *arg)
+{
+	printf("status:\n");
+	printf("\ttype:     %d\n", status->type);
+	printf("\tmessage:  %s\n", status->message);
+	printf("\tdetail:   %s\n", status->detail);
+	printf("\tprogress: %d\n", status->progress);
+
+}
+
 static struct discover_client_ops client_ops = {
 	.device_add = print_device_add,
+	.boot_option_add = print_boot_option_add,
 	.device_remove = print_device_remove,
+	.update_status = print_status,
 };
 
 int main(void)