Typo fixes, minor code refactoring

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

2 files changed, 13 insertions, 13 deletions

diff --git a/drivers/a.out b/drivers/a.out
deleted file mode 100755
index 24991fb..0000000
--- a/drivers/a.out
+++ /dev/null
diff --git a/src/userspace_io.c b/src/userspace_io.c
index d24f68a..6f29b2d 100644
--- a/src/userspace_io.c
+++ b/src/userspace_io.c
@@ -103,27 +103,27 @@ int main(int argc, char *argv[])
 		       (unsigned long)region_info.offset, region_info.flags,
 		       (region_info.flags & VFIO_REGION_INFO_FLAG_MMAP) ?
 		       "mmap allowed" : "mmap forbidden");
-		if (region_info.flags & VFIO_REGION_INFO_FLAG_MMAP) {
-			mmaps[cnt] = mmap(NULL, region_info.size, PROT_READ | PROT_WRITE,
-				      MAP_SHARED, device, region_info.offset);
-			if (mmaps[cnt] == MAP_FAILED) {
-				printf("mmap failed\n");
-				goto out;
-			}
-			memcpy(&regions[cnt], &region_info, sizeof(regions[cnt]));
-			if (i < device_info.num_regions)
-				cnt++;
+		if (!(region_info.flags & VFIO_REGION_INFO_FLAG_MMAP))
+			continue;
+		mmaps[cnt] = mmap(NULL, region_info.size, PROT_READ | PROT_WRITE,
+				  MAP_SHARED, device, region_info.offset);
+		if (mmaps[cnt] == MAP_FAILED) {
+			printf("mmap failed\n");
+			goto out;
 		}
+		memcpy(&regions[cnt], &region_info, sizeof(regions[cnt]));
+		if (i < device_info.num_regions)
+			cnt++;
 	}
 
-	printf("Tatal regions: %d\n", cnt + 1);
+	printf("Total regions: %d\n", cnt + 1);
 	/* FIXME THIS NEEDS TO BE ON DRIVER CALLBACK API
 	 * It's currently pointing on the rxdesc area
 	 */
 	rxring = mmaps[cnt - 1];
 
-#undef DBG //define to print pci BAR1
-#if DBG
+#define DBG //define to print pci BAR1
+#if defined DBG
 	int j;
 	size_t sz;
 	sz = regions[1].size / sizeof(uint32_t *);