Change ib_drivers example to ib_devices

Rename ib_drivers example program to ib_devices, which is a much more
sensible name.

Signed-off-by: Roland Dreier <roland@topspin.com>

diff --git a/Makefile.am b/Makefile.am
index 1c3bec79b56802bf65ff57a29df8aec013d50689..a85c01c2ebd39d6911a66894d8c403802c814993 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \
     $(libibverbs_version_script)
 src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map
 
-bin_PROGRAMS = examples/ib_drivers
-examples_ib_drivers_SOURCES = examples/driver_list.c
+bin_PROGRAMS = examples/ib_devices
+examples_ib_drivers_SOURCES = examples/device_list.c
 examples_ib_drivers_LDADD = $(top_builddir)/src/libibverbs.la
 
 libibverbsincludedir = $(includedir)/infiniband

diff --git a/examples/device_list.c b/examples/device_list.c
new file mode 100644 (file)
index 0000000..a5395d5
--- /dev/null
+++ b/examples/device_list.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2004 Topspin Communications.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * $Id$
+ */
+
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <endian.h>
+#include <byteswap.h>
+
+#include <infiniband/verbs.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+static inline uint64_t be64_to_cpu(uint64_t x) { return bswap_64(x); }
+#elif __BYTE_ORDER == __BIG_ENDIAN
+static inline uint64_t be64_to_cpu(uint64_t x) { return x; }
+#endif
+
+int main(int argc, char *argv[])
+{
+       struct dlist *dev_list;
+       struct ibv_device *ib_dev;
+
+       dev_list = ibv_get_devices();
+
+       printf("    %-16s\t   node GUID\n", "device");
+       printf("    %-16s\t----------------\n", "------");
+
+       dlist_for_each_data(dev_list, ib_dev, struct ibv_device)
+               printf("    %-16s\t%016llx\n",
+                      ibv_get_device_name(ib_dev),
+                      be64_to_cpu(ibv_get_device_guid(ib_dev)));
+}

diff --git a/examples/driver_list.c b/examples/driver_list.c
deleted file mode 100644 (file)
index a5395d5..0000000
--- a/examples/driver_list.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * $Id$
- */
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <endian.h>
-#include <byteswap.h>
-
-#include <infiniband/verbs.h>
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-static inline uint64_t be64_to_cpu(uint64_t x) { return bswap_64(x); }
-#elif __BYTE_ORDER == __BIG_ENDIAN
-static inline uint64_t be64_to_cpu(uint64_t x) { return x; }
-#endif
-
-int main(int argc, char *argv[])
-{
-       struct dlist *dev_list;
-       struct ibv_device *ib_dev;
-
-       dev_list = ibv_get_devices();
-
-       printf("    %-16s\t   node GUID\n", "device");
-       printf("    %-16s\t----------------\n", "------");
-
-       dlist_for_each_data(dev_list, ib_dev, struct ibv_device)
-               printf("    %-16s\t%016llx\n",
-                      ibv_get_device_name(ib_dev),
-                      be64_to_cpu(ibv_get_device_guid(ib_dev)));
-}