X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdrivers.c;h=30d6308a5ba57348c4c2e3695f83e6066b293864;hb=08f023fe97e402d68106299d04726f9094f00c45;hp=a5c21a08097de35395e4d9d98b322867b93c9779;hpb=ced48274051be6b3b1ed612260c893fdb2525946;p=libsigrok.git

diff --git a/src/drivers.c b/src/drivers.c
index a5c21a08..30d6308a 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2016 Lars-Peter Clausen <lars@metafoo.de>
  * Copyright (C) 2016 Aurelien Jacobs <aurel@gnuage.org>
+ * Copyright (C) 2017 Marcus Comstedt <marcus@mc.pp.se>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
@@ -25,32 +27,30 @@
 /*
  * sr_driver_list is a special section contains pointers to all the hardware
  * drivers built into the library. The __start and __stop symbols are
- * auto-generated by the linker (OSX needs a little help) and point to the start
- * and end of the section.  They are used to iterate over the list of all
- * drivers.
+ * created from driver_list_start.c and driver_list_stop.c, and point to the
+ * start and end of the section. They are used to iterate over the list of
+ * all drivers.
  */
-#ifdef __APPLE__
-extern struct sr_dev_driver *__start_sr_driver_list __asm("section$start$__DATA$__sr_driver_list");
-extern struct sr_dev_driver *__stop_sr_driver_list __asm("section$end$__DATA$__sr_driver_list");
-#else
-extern struct sr_dev_driver *__start_sr_driver_list;
-extern struct sr_dev_driver *__stop_sr_driver_list;
-#endif
+SR_PRIV extern const struct sr_dev_driver *sr_driver_list__start[];
+SR_PRIV extern const struct sr_dev_driver *sr_driver_list__stop[];
 
-/** @private
+/**
  * Initialize the driver list in a fresh libsigrok context.
  *
  * @param ctx Pointer to a libsigrok context struct. Must not be NULL.
+ *
+ * @private
  */
 SR_API void sr_drivers_init(struct sr_context *ctx)
 {
-	struct sr_dev_driver **drivers;
 	GArray *array;
 
 	array = g_array_new(TRUE, FALSE, sizeof(struct sr_dev_driver *));
-	for (drivers = &__start_sr_driver_list; drivers < &__stop_sr_driver_list;
-		drivers++)
+#ifdef HAVE_DRIVERS
+	for (const struct sr_dev_driver **drivers = sr_driver_list__start + 1;
+	     drivers < sr_driver_list__stop; drivers++)
 		g_array_append_val(array, *drivers);
+#endif
 	ctx->driver_list = (struct sr_dev_driver **)array->data;
 	g_array_free(array, FALSE);
 }