Fix merge

src/core/topology.c

@@ -95,7 +95,7 @@ struct handle_entry
 static struct handle_entry *devices_using_cuda;
 #  endif
 
-#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL) || defined(STARPU_SIMGRID)
+#if defined(STARPU_USE_CUDA) || defined(STARPU_USE_OPENCL) || defined(STARPU_USE_FPGA) || defined(STARPU_SIMGRID)
 static unsigned may_bind_automatically[STARPU_NARCH] = { 0 };
 #endif
 

src/core/workers.c

@@ -920,6 +920,9 @@ static void _starpu_launch_drivers(struct _starpu_machine_config *pconfig)
 
 #if defined(STARPU_USE_FPGA)
 			case STARPU_FPGA_WORKER:
+			{
+				struct starpu_driver driver;
+				driver.type = workerarg->arch;
 				if (!_starpu_may_launch_driver(&pconfig->conf, &driver))
 				{
 					workerarg->run_by_starpu = 0;
@@ -939,6 +942,7 @@ static void _starpu_launch_drivers(struct _starpu_machine_config *pconfig)
 				STARPU_PTHREAD_MUTEX_UNLOCK(&workerarg->mutex);
 #endif
 				break;
+			}
 #endif
 
 #ifdef STARPU_USE_MPI_MASTER_SLAVE

src/drivers/max/driver_fpga_init.c

@@ -17,7 +17,7 @@
 #include <core/workers.h>
 #include <drivers/max/driver_fpga.h>
 
-static struct starpu_driver_info driver_info = {
+static struct _starpu_driver_info driver_info = {
 	.name_upper = "FPGA",
 	.name_var = "FPGA",
 	.name_lower = "fpga",
@@ -25,13 +25,13 @@ static struct starpu_driver_info driver_info = {
 	.alpha = 0.5,
 };
 
-static struct starpu_memory_driver_info memory_driver_info = {
+static struct _starpu_memory_driver_info memory_driver_info = {
 	.name_upper = "FPGA",
 	.worker_archtype = STARPU_FPGA_WORKER,
 };
 
 void _starpu_fpga_preinit(void)
 {
-	starpu_driver_info_register(STARPU_FPGA_WORKER, &driver_info);
-	starpu_memory_driver_info_register(STARPU_FPGA_RAM, &memory_driver_info);
+	_starpu_driver_info_register(STARPU_FPGA_WORKER, &driver_info);
+	_starpu_memory_driver_info_register(STARPU_FPGA_RAM, &memory_driver_info);
 }