[gphoto-cvs] SF.net SVN: gphoto:[12933] trunk/libgphoto2/camlibs/ax203/ax203.c

[<jwr...@us...>]

Revision: 12933
          http://gphoto.svn.sourceforge.net/gphoto/?rev=12933&view=rev
Author:   jwrdegoede
Date:     2010-04-09 12:06:14 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
ax203: Move handling of ISO image mem usage and memory end

Move the handling of ISO image mem usage and memory end to
ax203_build_used_mem_table(), this is another storageinfo preperation
patch.

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ax203/ax203.c

Modified: trunk/libgphoto2/camlibs/ax203/ax203.c
===================================================================
--- trunk/libgphoto2/camlibs/ax203/ax203.c	2010-04-09 12:06:09 UTC (rev 12932)
+++ trunk/libgphoto2/camlibs/ax203/ax203.c	2010-04-09 12:06:14 UTC (rev 12933)
@@ -1048,6 +1048,20 @@
 	count = ax203_read_filecount (camera);
 	if (count < 0) return count;
 
+	/* The beginning of the memory is used by the CD image and stuff */
+	fileinfo.address = 0;
+	switch (camera->pl->firmware_version) {
+	case AX203_FIRMWARE_3_3_x:
+	case AX203_FIRMWARE_3_4_x:
+		fileinfo.size = camera->pl->fs_start + AX203_PICTURE_OFFSET;
+		break;
+	case AX203_FIRMWARE_3_5_x:
+		fileinfo.size = camera->pl->fs_start + AX206_PICTURE_OFFSET;
+		break;
+	}
+	fileinfo.present = 1;
+	table[found++] = fileinfo;
+
 	for (i = 0; i < count; i++) {
 		CHECK (ax203_read_fileinfo (camera, i, &fileinfo))
 		if (!fileinfo.present)
@@ -1057,6 +1071,13 @@
 	qsort (table, found, sizeof(struct ax203_fileinfo),
 	       ax203_fileinfo_cmp);
 
+	/* Add a last memory used region which starts at the end of memory
+	   the size does not matter as this is the last entry. */
+	fileinfo.address = camera->pl->mem_size;
+	fileinfo.size    = 0;
+	fileinfo.present = 1;
+	table[found++] = fileinfo;
+
 	return found;
 }
 
@@ -1097,24 +1118,9 @@
 	if (used_mem_count < 0) return used_mem_count;
 
 	/* Try to find a large enough "hole" in the memory */
-	switch (camera->pl->firmware_version) {
-	case AX203_FIRMWARE_3_3_x:
-	case AX203_FIRMWARE_3_4_x:
-		prev_end = camera->pl->fs_start + AX203_PICTURE_OFFSET;
-		break;
-	case AX203_FIRMWARE_3_5_x:
-		prev_end = camera->pl->fs_start + AX206_PICTURE_OFFSET;
-		break;
-	}
-	for (i = 0; i <= used_mem_count; i++) {
-		/* Fake a present fileinfo at the end of picture mem */
-		if (i == used_mem_count) {
-			fileinfo.address = camera->pl->mem_size;
-		} else {
-			fileinfo = used_mem[i];
-		}
-
-		hole_size = fileinfo.address - prev_end;
+	for (i = 1; i < used_mem_count; i++) {
+		prev_end = used_mem[i - 1].address + used_mem[i - 1].size;
+		hole_size = used_mem[i].address - prev_end;
 		if (hole_size)
 			GP_DEBUG ("found a hole at: %08x, of %d bytes "
 				  "(need %d)\n", prev_end, hole_size, size);
@@ -1130,8 +1136,6 @@
 						buf, size))
 			return GP_OK;
 		}
-		/* Set previous picture end for next iteration */
-		prev_end = fileinfo.address + fileinfo.size;
 	}
 
 	gp_log (GP_LOG_ERROR, "ax203", "not enough freespace to add file");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.