Use uio device_index instead of resid to access memory allocation map

The uio.device_index is unique for each UIO device, whereas the resid
is defined by the order in which the UIO devices are opened via
uio_open_named or uio_open_blocks and may differ from one process
to another.

With the addition of this patch the resid argument to uio_malloc()
and uio_free() has become unnecessary and so has been removed.

Author: dhobsong

src/libuiomux/uio.c

@@ -482,7 +482,7 @@ static int uio_mem_free(int fd, int res, int offset, int count)
 	return ret;
 }
 
-void *uio_malloc(struct uio *uio, int resid, size_t size, int align, int shared)
+void *uio_malloc(struct uio *uio, size_t size, int align, int shared)
 {
 	unsigned char * mem_base;
 	int pagesize, pages_req, pages_max;
@@ -500,18 +500,18 @@ void *uio_malloc(struct uio *uio, int resid, size_t size, int align, int shared)
 	pages_max = (uio->mem.size + pagesize - 1) / pagesize;
 	pages_req = (size + pagesize - 1) / pagesize;
 
-	if ((base = uio_mem_find(uio->dev.fd, resid,
+	if ((base = uio_mem_find(uio->dev.fd, uio->device_index,
 				 pages_max, pages_req, shared)) == -1)
 		return NULL;
-	uio_mem_alloc(uio->dev.fd, resid, base, pages_req, shared);
+	uio_mem_alloc(uio->dev.fd, uio->device_index, base, pages_req, shared);
 
 	mem_base = (void *)
 		((unsigned long)uio->mem.iomem + (base * pagesize));
 
 	return mem_base;
 }
 
-void uio_free(struct uio *uio, int resid, void *address, size_t size)
+void uio_free(struct uio *uio, void *address, size_t size)
 {
 	int pagesize, base, pages_req;
 
@@ -520,7 +520,7 @@ void uio_free(struct uio *uio, int resid, void *address, size_t size)
 	base = (int)(((unsigned long)address -
 		      (unsigned long)uio->mem.iomem) / pagesize);
 	pages_req = (size + pagesize - 1) / pagesize;
-	uio_mem_free(uio->dev.fd, resid, base, pages_req);
+	uio_mem_free(uio->dev.fd, uio->device_index, base, pages_req);
 }
 
 static void print_usage(int pid, long base, long top)

src/libuiomux/uio.h

@@ -63,10 +63,10 @@ int
 uio_read_nonblocking(struct uio *uio);
 
 void *
-uio_malloc (struct uio * uio, int resid, size_t size, int align, int shared);
+uio_malloc (struct uio * uio, size_t size, int align, int shared);
 
 void
-uio_free (struct uio * uio, int resid, void * address, size_t size);
+uio_free (struct uio * uio, void * address, size_t size);
 
 void
 uio_meminfo (struct uio * uio);

src/libuiomux/uiomux.c

@@ -407,7 +407,7 @@ void *uiomux_malloc(struct uiomux *uiomux, uiomux_resource_t blockmask,
 		if (!mem)
 			return NULL;
 
-		ret = uio_malloc(uio, i, size, align, 0);
+		ret = uio_malloc(uio, size, align, 0);
 
 		if (ret) {
 			mem->virt = ret;
@@ -446,7 +446,7 @@ void *uiomux_malloc_shared(struct uiomux *uiomux, uiomux_resource_t blockmask,
 		fprintf(stderr, "%s: Allocating %d bytes shm for block %d\n",
 			__func__, size, i);
 #endif
-		ret = uio_malloc(uio, i, size, align, 1);
+		ret = uio_malloc(uio, size, align, 1);
 	}
 
 	return ret;
@@ -471,7 +471,7 @@ uiomux_free(struct uiomux *uiomux, uiomux_resource_t blockmask,
 		fprintf(stderr, "%s: Freeing memory for block %d\n",
 			__func__, i);
 #endif
-		uio_free(uio, i, address, size);
+		uio_free(uio, address, size);
 
 		pthread_mutex_lock(&mutex);
 		mem = find_mem_block(&g_mem_regions, address);