From 4ebbd1d797c05f3cbadd94fcd834bc5957b49e5a Mon Sep 17 00:00:00 2001
From: Octasic Inc <support@octasic.com>
Date: Thu, 14 Feb 2008 17:47:08 +0200
Subject: importing OCT612x-01.01.01

---
 software/include/octosdependant.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'software/include/octosdependant.h')

diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h
index 6e797bc..c0811f9 100644
--- a/software/include/octosdependant.h
+++ b/software/include/octosdependant.h
@@ -2,7 +2,7 @@
 
 File: octosdependant.h
 
-    Copyright (c) 2001-2007 Octasic Inc.
+    Copyright (c) 2001-2008 Octasic Inc.
 
 Description:
 
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR49 $
+$Octasic_Release: OCT612xAPI-01.01.01 $
 
-$Octasic_Revision: 18 $
+$Octasic_Revision: 20 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -98,19 +98,15 @@ extern "C" {
 	/* Try with cpu type */
 	#if !defined(OCT_MACH_ENDIAN)
 		/* Look for intel */
-		#if defined( _M_IX86 )
+		#if defined( _M_IX86 ) || defined( __i386__ )
 			#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 		/* Look for PowerPC */
 		#elif defined( _M_MPPC  ) || defined( _M_PPC ) || defined(PPC) || defined(__PPC) || defined(_ARCH_PPC)
 			#define OCT_MACH_ENDIAN		OCT_MACH_BIG_ENDIAN
 		#elif defined( CPU )
-			#if CPU==PPC860 || CPU==SIMNT
+			#if CPU==PPC860
 				#define OCT_MACH_ENDIAN		OCT_MACH_BIG_ENDIAN
-			#else
-				#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 			#endif
-		#else
-			#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 		#endif
 	#endif
 #else
@@ -121,6 +117,11 @@ extern "C" {
 	#endif
 #endif
 
+/* Have we reached a conclusion ? */
+#if OCT_MACH_ENDIAN != OCT_MACH_LITTLE_ENDIAN && OCT_MACH_ENDIAN != OCT_MACH_BIG_ENDIAN
+#error Endanness cannot be detected; Please specify in Makefile.pre
+#endif
+
 /* Find system type if not already defined */
 #if !defined( OCT_NTDRVENV ) && !defined( OCT_VXENV ) && !defined( OCT_WINENV )
 
-- 
cgit v1.2.3