Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/ChangeLog,v
retrieving revision 1.113
diff -U8 -r1.113 ChangeLog
--- ChangeLog	9 May 2006 15:51:39 -0000	1.113
+++ ChangeLog	27 Sep 2007 15:05:14 -0000
@@ -1,8 +1,13 @@
+2007-09-27  Grant Edwards <grante@visi.com>
+
+        * include/hal_endian.h (SWAP16): Fix "return value" so
+        that it only returns data in lower 16 bits instead of 24.
+
 2006-05-09  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/hal_if.c (cyg_hal_diag_mangler_gdb_flush): Fix compiler
 	warning about signed/unsigned.
 
 2006-04-19  Alexander Neundorf <alexander.neundorf@jenoptik.com
 
 	* include/hal_if.h, src/hal_if.c: add a VV call for modifying
Index: include/hal_endian.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/include/hal_endian.h,v
retrieving revision 1.3
diff -U8 -r1.3 hal_endian.h
--- include/hal_endian.h	23 May 2002 23:02:47 -0000	1.3
+++ include/hal_endian.h	27 Sep 2007 15:05:14 -0000
@@ -58,17 +58,17 @@
 
 // Allow HALs to override the generic implementation of swap macros
 #ifdef CYGBLD_HAL_ENDIAN_H
 # include CYGBLD_HAL_ENDIAN_H
 #endif
 
 #ifndef CYG_SWAP16
 # define CYG_SWAP16(_x_)                                        \
-    ({ cyg_uint16 _x = (_x_); ((_x << 8) | (_x >> 8)); })
+    ({ cyg_uint16 _x = (_x_); (cyg_uint16)((_x << 8) | (_x >> 8)); })
 #endif
 
 #ifndef CYG_SWAP32
 # define CYG_SWAP32(_x_)                        \
     ({ cyg_uint32 _x = (_x_);                   \
        ((_x << 24) |                            \
        ((0x0000FF00UL & _x) <<  8) |            \
        ((0x00FF0000UL & _x) >>  8) |            \