hurd/fatfs ChangeLog fat.h

[Marcus Brinkmann]

CVSROOT:        /cvsroot/hurd
Module name:    hurd
Branch:         
Changes by:     Marcus Brinkmann <address@hidden>       03/08/09 12:37:58

Modified files:
        fatfs          : ChangeLog fat.h 

Log message:
        2003-08-09  Marcus Brinkmann  <address@hidden>
        
        * fat.h (read_dword) [BYTE_ORDER == BIG_ENDIAN]: Use bswap_32 to
        swap bytes.
        (write_dword) [BYTE_ORDER == BIG_ENDIAN]: Likewise.
        (read_word) [BYTE_ORDER == BIG_ENDIAN]: Use bswap_16 to swap bytes.
        (write_word) [BYTE_ORDER == BIG_ENDIAN]: Likewise.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/fatfs/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/hurd/hurd/fatfs/fat.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: hurd/fatfs/ChangeLog
diff -u hurd/fatfs/ChangeLog:1.9 hurd/fatfs/ChangeLog:1.10
--- hurd/fatfs/ChangeLog:1.9    Wed Aug  6 17:47:57 2003
+++ hurd/fatfs/ChangeLog        Sat Aug  9 12:37:58 2003
@@ -1,3 +1,11 @@
+2003-08-09  Marcus Brinkmann  <address@hidden>
+
+       * fat.h (read_dword) [BYTE_ORDER == BIG_ENDIAN]: Use bswap_32 to
+       swap bytes.
+       (write_dword) [BYTE_ORDER == BIG_ENDIAN]: Likewise.
+       (read_word) [BYTE_ORDER == BIG_ENDIAN]: Use bswap_16 to swap bytes.
+       (write_word) [BYTE_ORDER == BIG_ENDIAN]: Likewise.
+
 2003-08-03  Marco Gerards  <address@hidden>
 
        * fatfs.h (struct disknode): New member DIRNODE.
Index: hurd/fatfs/fat.h
diff -u hurd/fatfs/fat.h:1.1 hurd/fatfs/fat.h:1.2
--- hurd/fatfs/fat.h:1.1        Tue Dec  3 15:52:59 2002
+++ hurd/fatfs/fat.h    Sat Aug  9 12:37:58 2003
@@ -1,5 +1,5 @@
 /* fat.h - Support for FAT filesystems interfaces.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    Written by Marcus Brinkmann.
 
    This file is part of the GNU Hurd.
@@ -353,10 +353,9 @@
 #if BYTE_ORDER == LITTLE_ENDIAN
   return *(unsigned int *)addr;
 #elif BYTE_ORDER == BIG_ENDIAN
-  return *(unsigned int *)(addr + 4);
+  return bswap_32 (*(unsigned int *) addr);
 #else
-  return
-    addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
+#error unknown byte order
 #endif
 }
 
@@ -366,9 +365,9 @@
 #if BYTE_ORDER == LITTLE_ENDIAN
   return *(unsigned short *)addr;
 #elif BYTE_ORDER == BIG_ENDIAN
-  return *(unsigned short *)addr + 2;
+  return bswap_16 (*(unsigned int *) addr);
 #else
-  return addr[0] | (addr[1] << 8);
+#error unknown byte order
 #endif
 }
 
@@ -378,12 +377,9 @@
 #if BYTE_ORDER == LITTLE_ENDIAN
   *(unsigned int *)addr = value;
 #elif BYTE_ORDER == BIG_ENDIAN
-#error unknown byte order
+  *(unsigned int *)addr = bswap_32 (value);
 #else
-  addr[0] = value & 0xff;
-  addr[1] = (value >> 8) & 0xff;
-  addr[2] = (value >> 16) & 0xff;
-  addr[3] = (value >> 24) & 0xff;
+#error unknown byte order
 #endif
 }
 
@@ -393,10 +389,9 @@
 #if BYTE_ORDER == LITTLE_ENDIAN
   *(unsigned short *)addr = value;
 #elif BYTE_ORDER == BIG_ENDIAN
-#error unknown byte order
+  *(unsigned int *)addr = bswap_16 (value);
 #else
-  addr[0] = value & 0xff;
-  addr[1] = (value >> 8) & 0xff;
+#error unknown byte order
 #endif
 }