Changeset 1151 for trunk

Timestamp:

04/24/11 01:14:44 (2 years ago)

Author:

reyalP

Message:

increase size of buffer for readder on dryos R39 (and later) cams

Location:

trunk

Files:

• include/stdlib.h (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/include/stdlib.h

@@ -214 +214 @@
 #endif
 
+// NOTE this is NOT the actual structure returned by dryos opendir!
 typedef struct {
-    unsigned int        fd;
+    unsigned int        fd; // first member is an fd from Open in dryos
     unsigned int        loc;
     struct dirent       dir;

trunk/platform/generic/wrappers.c

@@ -370 +370 @@
     return _readdir(d);
 #else
-// for DRYOS cameras  A650, A720  do something with this!  - sizeof(de[]) must be >= sizeof(struct dirent): 'static char de[40];'
-  static char de[40] = "";      // (philmoz 15/4/2011) Must initialize this variable or GCC 4.4.0 will generate bad code and the File Browser will crash.
-                            // (reyalp) - whaaaaaaaaaa ?
-  _ReadFastDir(d, &de);
-  return de[0]? &de : (void*)0;
+// TODO this makes a single static buffer for all directory handles.
+// This means you can only use one at a time, unless you memcpy!
+#ifdef CAM_DRYOS_2_3_R39
+  static char de[64];
+#else
+  static char de[40];
+#endif
+
+  _ReadFastDir(d, de);
+  return de[0]? de : (void*)0;
 #endif
 }