fixes following merge

include/starpu_worker.h

@@ -48,8 +48,8 @@ enum starpu_node_kind
 	STARPU_OPENCL_RAM=3,
 	STARPU_DISK_RAM=4,
 	STARPU_MIC_RAM=5,
-	STARPU_MPI_MS_RAM=6
-	STARPU_FPGA_RAM=7,
+	STARPU_FPGA_RAM=6,
+	STARPU_MPI_MS_RAM=7,
 };
 
 /**

src/datawizard/copy_driver.c

@@ -157,8 +157,6 @@ static int copy_data_1_to_1_generic(starpu_data_handle_t handle,
 
 	STARPU_ASSERT(src_replicate->allocated);
 	STARPU_ASSERT(dst_replicate->allocated);
-	//int ret = 0;
-
 
 #ifdef STARPU_SIMGRID
 	if (src_node == STARPU_MAIN_RAM || dst_node == STARPU_MAIN_RAM)
@@ -166,8 +164,9 @@ static int copy_data_1_to_1_generic(starpu_data_handle_t handle,
 
 	return _starpu_simgrid_transfer(handle->ops->get_size(handle), src_node, dst_node, req);
 #else /* !SIMGRID */
-	const struct starpu_data_copy_methods *copy_methods = handle->ops->copy_methods;
-	enum starpu_node_kind src_kind = starpu_node_get_kind(src_node);
+	enum starpu_node_kind dst_kind = starpu_node_get_kind(dst_node);
+	void *src_interface = src_replicate->data_interface;
+	void *dst_interface = dst_replicate->data_interface;
 
 #if defined(STARPU_USE_CUDA) && defined(STARPU_HAVE_CUDA_MEMCPY_PEER) && !defined(STARPU_SIMGRID)
 	enum starpu_node_kind src_kind = starpu_node_get_kind(src_node);

src/drivers/max/driver_fpga.c

@@ -528,7 +528,7 @@ void _starpu_fpga_transfer_data(void *buffers[], struct _starpu_job *j, int chnl
 	}
 }
 
-int _starpu_fpga_copy_interface_from_fpga_to_cpu(uintptr_t src, size_t src_offset, unsigned src_node, uintptr_t dst, size_t dst_offset, unsigned dst_node, size_t size, struct _starpu_async_channel *async_channel)
+int _starpu_fpga_copy_interface_from_fpga_to_cpu(starpu_data_handle_t handle, void *src_interface, unsigned src_node, void *dst_interface, unsigned dst_node, struct _starpu_data_request *req)
 {
 	int src_kind = starpu_node_get_kind(src_node);
 	int dst_kind = starpu_node_get_kind(dst_node);