Use portable code for camera structures that does not depend

on gcc or little-endian byte order

backend/dc240.c

@@ -313,7 +313,7 @@ static SANE_Byte read_dir_pck[] = READ_DIR_PCK;
 static struct pkt_speed speeds[] = SPEEDS;
 static struct termios tty_orig;
 
-static struct dir_buf dir_buf;
+SANE_Byte dir_buf2[2 + CAMDIRENTRYSIZE * DIRENTRIES];
 
 static struct cam_dirlist *dir_head = NULL;
 
@@ -1843,13 +1843,14 @@ read_dir (SANE_String dir)
       return -1;
     }
 
-  if (read_data (Camera.fd, (SANE_Byte *) & dir_buf, 256) == -1)
+
+  if (read_data (Camera.fd, (SANE_Byte *) & dir_buf2, 256) == -1)
     {
       DBG (1, "%s: error: read_data returned -1\n", f);
       return -1;
     }
 
-  entries = (dir_buf.entries_msb << 8) + dir_buf.entries_lsb;
+  entries = (dir_buf2[0] << 8) + dir_buf2[1];
   DBG (127, "%s: result of dir read is %x, number of entries=%d\n", f, r,
        entries);
 
@@ -1860,8 +1861,9 @@ read_dir (SANE_String dir)
     }
 
   /* Determine if it's time to read another 256 byte buffer from the camera */
-  next_buf = ((SANE_Byte *) & dir_buf) + 256;
+
-  while ((SANE_Byte *) (&dir_buf.entry[entries]) >= (SANE_Byte *) next_buf)
+  next_buf = ((SANE_Byte *) & dir_buf2) + 256;
+  while (dir_buf2 + 2 + CAMDIRENTRYSIZE * entries >= (SANE_Byte *) next_buf)
     {
 
       DBG (127, "%s: reading additional directory buffer\n", f);
@@ -1879,15 +1881,16 @@ read_dir (SANE_String dir)
       /* Hack: I don't know what attr is used for, so setting it
        * to zero is a convenient way to put in the null terminator
        */
-      dir_buf.entry[i].attr = 0;
+      get_attr (i) = 0;
-      DBG (127, "%s: entry=%s\n", f, dir_buf.entry[i].name);
+      DBG (127, "%s: entry=%s\n", f, get_name (i));
 
-      if (dir_buf.entry[i].name[0] == '.')
+      if ((get_name (i))[0] == '.')
 	{
 	  continue;
 	}
 
-      if (dir_insert (&dir_buf.entry[i]) != 0)
+      if (dir_insert
+	  ((struct cam_dirent *) &dir_buf2[2 + CAMDIRENTRYSIZE * i]) != 0)
 	{
 	  DBG (1, "%s: error: failed to insert dir entry\n", f);
 	  return -1;

backend/dc240.h

@@ -205,22 +205,37 @@ struct cam_dirent
 
 #ifdef __GNUC__
 #define UNUSEDARG __attribute__ ((unused))
-#define PACKED 	  __attribute__ ((packed))
 #else
 #define UNUSEDARG
-/* You need to figure out a way to ensure that there are no holes
- * in the following dir_buf structure - it has to match data read from
- * the camera.  gcc does this with __attribute__ ((packed))
- */
-#  error "Please port to this compiler."
 #endif
 
+#ifdef OLD
+
+/* This is the layout of the directory in the camera - Unfortunately,
+ * this only works in gcc.
+ */
 struct dir_buf
 {
   SANE_Byte entries_msb PACKED;
   SANE_Byte entries_lsb PACKED;
   struct cam_dirent entry[1000] PACKED;
 };
+#else
+
+/* So, we have to do it the hard way...  */
+
+#define CAMDIRENTRYSIZE 20
+#define DIRENTRIES 1000
+
+
+#define get_name(entry) (SANE_Char*) &dir_buf2[2+CAMDIRENTRYSIZE*(entry)]
+#define get_attr(entry) dir_buf2[2+11+CAMDIRENTRYSIZE*(entry)]
+#define get_create_time(entry) \
+   (  dir_buf2[2+12+CAMDIRENTRYSIZE*(entry)] << 8 \
+    + dir_buf2[2+13+CAMDIRENTRYSIZE*(entry)])
+
+
+#endif
 
 struct cam_dirlist
 {