X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftest%2Fpb-test.c;h=f3ef746de2382488fc40c469dcbe0e39c37383da;hp=a36e991507563f2d59e9dd51a885b19b95adf85b;hb=6fd6d956ae55e755e2116d86942c62767df033de;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1

diff --git a/ui/test/pb-test.c b/ui/test/pb-test.c
index a36e991..f3ef746 100644
--- a/ui/test/pb-test.c
+++ b/ui/test/pb-test.c
@@ -2,11 +2,11 @@
 #include <stdio.h>
 
 #include "ui/common/discover-client.h"
-#include "ui/common/device.h"
 
-static int print_device_add(struct device *device)
+static int print_device_add(struct device *device,
+	void __attribute__((unused)) *arg)
 {
-	int i;
+	struct boot_option *opt;
 
 	printf("new device:\n");
 	printf("\tid:   %s\n", device->id);
@@ -14,9 +14,8 @@ static int print_device_add(struct device *device)
 	printf("\tdesc: %s\n", device->description);
 	printf("\ticon: %s\n", device->icon_file);
 
-	printf("\t%d boot options:\n", device->n_options);
-	for (i = 0; i < device->n_options; i++) {
-		struct boot_option *opt = &device->options[i];
+	printf("\tboot options:\n");
+	list_for_each_entry(&device->boot_options, opt, list) {
 		printf("\t\tid:   %s\n", opt->id);
 		printf("\t\tname: %s\n", opt->name);
 		printf("\t\tdesc: %s\n", opt->description);
@@ -29,24 +28,24 @@ static int print_device_add(struct device *device)
 	return 0;
 }
 
-static void print_device_remove(const char *dev_id)
+static void print_device_remove(struct device *device,
+	void __attribute__((unused)) *arg)
 {
 	printf("removed device:\n");
-	printf("\tid:   %s\n", dev_id);
+	printf("\tid:   %s\n", device->id);
+	printf("\tname: %s\n", device->name);
 }
 
-struct discover_client_ops client_ops = {
-	.add_device = print_device_add,
-	.remove_device = print_device_remove,
+static struct discover_client_ops client_ops = {
+	.device_add = print_device_add,
+	.device_remove = print_device_remove,
 };
 
 int main(void)
 {
 	struct discover_client *client;
 
-	printf("pid: %d\n", getpid());
-
-	client = discover_client_init(&client_ops);
+	client = discover_client_init(&client_ops, NULL);
 	if (!client)
 		return -1;