Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/remotelaboratory

servers/fpga_server_lin/src/bbb-gpmc-init.cpp

@@ -82,7 +82,7 @@ void gpmc_mapregisters() {
 	);
 
 	if (gpmc_map == MAP_FAILED) {
-		printf("[FATAL] mmap error %d\n", (int)gpmc_map);
+		printf("[FATAL] mmap error %p\n", gpmc_map);
 		return;
 	}
 
@@ -148,7 +148,7 @@ int setup_gpmc_bbb(void) {
 	);
 
 	if (gpio_map == MAP_FAILED) {
-		printf("[FATAL] mmap error %d\n", (int)gpio_map);
+		printf("[FATAL] mmap error %p\n", gpio_map);
 		return -1;
 	}
 
@@ -197,4 +197,4 @@ void memcpy_to_gpmc(char* source, unsigned int register_offset, unsigned int len
 	}
 }
 
-/** END: Low-Level I/O Implementation **/
+/** END: Low-Level I/O Implementation **/