Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-30 21:36:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix endian conditional compilation

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@644 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2008-02-06 21:08:16 +00:00
parent 14570ca238
commit 669118c68e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/fs_fat32.h
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* fs_fat32.h * fs_fat32.h
* *
* Copyright (C) 2007 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * distribution.
* 3. Neither the name Gregory Nutt nor the names of its contributors may be * 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@@ -241,7 +241,7 @@
* stream can force special, byte-by-byte accesses. * stream can force special, byte-by-byte accesses.
*/ */
#ifdef CONFIG_ARCH_BIGENDIAN #ifdef CONFIG_ENDIAN_BIG
/* If the target is big-endian, then even aligned multi-byte values must be /* If the target is big-endian, then even aligned multi-byte values must be
* accessed byte-by-byte. * accessed byte-by-byte.
fs/fs_fat32util.c
+6 -6
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* fs_fat32util.c * fs_fat32util.c
* *
* Copyright (C) 2007 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* References: * References:
@@ -19,7 +19,7 @@
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * distribution.
* 3. Neither the name Gregory Nutt nor the names of its contributors may be * 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@@ -432,7 +432,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
uint16 fat_getuint16(ubyte *ptr) uint16 fat_getuint16(ubyte *ptr)
{ {
#ifdef CONFIG_ARCH_BIGENDIAN #ifdef CONFIG_ENDIAN_BIG
/* The bytes always have to be swapped if the target is big-endian */ /* The bytes always have to be swapped if the target is big-endian */
return ((uint16)ptr[0] << 8) | ptr[1]; return ((uint16)ptr[0] << 8) | ptr[1];
@@ -449,7 +449,7 @@ uint16 fat_getuint16(ubyte *ptr)
uint32 fat_getuint32(ubyte *ptr) uint32 fat_getuint32(ubyte *ptr)
{ {
#ifdef CONFIG_ARCH_BIGENDIAN #ifdef CONFIG_ENDIAN_BIG
/* The bytes always have to be swapped if the target is big-endian */ /* The bytes always have to be swapped if the target is big-endian */
return ((uint32)fat_getuint16(&ptr[0]) << 16) | fat_getuint16(&ptr[2]); return ((uint32)fat_getuint16(&ptr[0]) << 16) | fat_getuint16(&ptr[2]);
@@ -467,7 +467,7 @@ uint32 fat_getuint32(ubyte *ptr)
void fat_putuint16(ubyte *ptr, uint16 value16) void fat_putuint16(ubyte *ptr, uint16 value16)
{ {
ubyte *val = (ubyte*)&value16; ubyte *val = (ubyte*)&value16;
#ifdef CONFIG_ARCH_BIGENDIAN #ifdef CONFIG_ENDIAN_BIG
/* The bytes always have to be swapped if the target is big-endian */ /* The bytes always have to be swapped if the target is big-endian */
ptr[0] = val[1]; ptr[0] = val[1];
@@ -487,7 +487,7 @@ void fat_putuint16(ubyte *ptr, uint16 value16)
void fat_putuint32(ubyte *ptr, uint32 value32) void fat_putuint32(ubyte *ptr, uint32 value32)
{ {
uint16 *val = (uint16*)&value32; uint16 *val = (uint16*)&value32;
#ifdef CONFIG_ARCH_BIGENDIAN #ifdef CONFIG_ENDIAN_BIG
/* The bytes always have to be swapped if the target is big-endian */ /* The bytes always have to be swapped if the target is big-endian */
fat_putuint16(&ptr[0], val[2]); fat_putuint16(&ptr[0], val[2]);