Cleanup discover_device in examples

Andrei Tchijov pointed out that the discover_device() function is written
in a strange way.
This commit is contained in:
Daniel Drake 2007-12-01 13:00:33 +00:00
parent 3479dee0e4
commit c1f8581ec9
5 changed files with 36 additions and 51 deletions

View file

@ -26,16 +26,13 @@
struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs)
{ {
struct fp_dscv_dev *ddev = NULL; struct fp_dscv_dev *ddev = discovered_devs[0];
int i; struct fp_driver *drv;
if (!ddev)
for (i = 0; ddev = discovered_devs[i]; i++) { return NULL;
struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
printf("Found device claimed by %s driver\n", drv = fp_dscv_dev_get_driver(ddev);
fp_driver_get_full_name(drv)); printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv));
return ddev;
}
return ddev; return ddev;
} }

View file

@ -24,16 +24,13 @@
struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs)
{ {
struct fp_dscv_dev *ddev = NULL; struct fp_dscv_dev *ddev = discovered_devs[0];
int i; struct fp_driver *drv;
if (!ddev)
for (i = 0; ddev = discovered_devs[i]; i++) { return NULL;
struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
printf("Found device claimed by %s driver\n", drv = fp_dscv_dev_get_driver(ddev);
fp_driver_get_full_name(drv)); printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv));
return ddev;
}
return ddev; return ddev;
} }

View file

@ -116,18 +116,15 @@ static void QueryXv()
printf("No suitable Xv adaptor found\n"); printf("No suitable Xv adaptor found\n");
} }
static struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs)
{ {
struct fp_dscv_dev *ddev = NULL; struct fp_dscv_dev *ddev = discovered_devs[0];
int i; struct fp_driver *drv;
if (!ddev)
for (i = 0; ddev = discovered_devs[i]; i++) { return NULL;
struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
printf("Found device claimed by %s driver\n", drv = fp_dscv_dev_get_driver(ddev);
fp_driver_get_full_name(drv)); printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv));
return ddev;
}
return ddev; return ddev;
} }

View file

@ -26,16 +26,13 @@
struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs)
{ {
struct fp_dscv_dev *ddev = NULL; struct fp_dscv_dev *ddev = discovered_devs[0];
int i; struct fp_driver *drv;
if (!ddev)
for (i = 0; ddev = discovered_devs[i]; i++) { return NULL;
struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
printf("Found device claimed by %s driver\n", drv = fp_dscv_dev_get_driver(ddev);
fp_driver_get_full_name(drv)); printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv));
return ddev;
}
return ddev; return ddev;
} }

View file

@ -25,16 +25,13 @@
struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs) struct fp_dscv_dev *discover_device(struct fp_dscv_dev **discovered_devs)
{ {
struct fp_dscv_dev *ddev = NULL; struct fp_dscv_dev *ddev = discovered_devs[0];
int i; struct fp_driver *drv;
if (!ddev)
for (i = 0; ddev = discovered_devs[i]; i++) { return NULL;
struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
printf("Found device claimed by %s driver\n", drv = fp_dscv_dev_get_driver(ddev);
fp_driver_get_full_name(drv)); printf("Found device claimed by %s driver\n", fp_driver_get_full_name(drv));
return ddev;
}
return ddev; return ddev;
} }