liliana/r-link-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source
This commit is contained in:
Wolfgang Denk 2006-05-30 15:58:20 +02:00
parent ba94a1bba3
commit d945527305
12 changed files with 74 additions and 2592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2512
cpu/ixp/npe/include/#IxEthAcc.h#
View File

File diff suppressed because it is too large Load Diff

4
cpu/ixp/npe/include/IxEthDB.h
View File

@ -799,10 +799,10 @@ IxEthDBStatus ixEthDBFilteringDatabaseShowRecords(IxEthDBPortId portID, IxEthDBR
* @verbatim * @verbatim
IxEthDBPortMap portMap; IxEthDBPortMap portMap;
// clear all ports from port map /* clear all ports from port map */
memset(portMap, 0, sizeof (portMap)); memset(portMap, 0, sizeof (portMap));
// include portID in port map /* include portID in port map */
portMap[portID / 8] = 1 << (portID % 8); portMap[portID / 8] = 1 << (portID % 8);
@endverbatim @endverbatim
* *

6
cpu/ixp/npe/include/IxOsalIoMem.h
View File

@ -63,13 +63,12 @@
* @{ * @{
*/ */
/* Low-level conversion macros - DO NOT USE UNLESS ABSOLUTELY NEEDED */ /* Low-level conversion macros - DO NOT USE UNLESS ABSOLUTELY NEEDED */
#ifndef __wince #ifndef __wince
/* /*
* Private function to swap word*//* * Private function to swap word
*/ */
#ifdef __XSCALE__ #ifdef __XSCALE__
static __inline__ UINT32 static __inline__ UINT32
@ -92,7 +91,6 @@ ixOsalCoreWordSwap (UINT32 wordIn)
return wordOut; return wordOut;
} }
#define IX_OSAL_SWAP_LONG(wData) (ixOsalCoreWordSwap(wData)) #define IX_OSAL_SWAP_LONG(wData) (ixOsalCoreWordSwap(wData))
#else #else
#define IX_OSAL_SWAP_LONG(wData) ((wData >> 24) | (((wData >> 16) & 0xFF) << 8) | (((wData >> 8) & 0xFF) << 16) | ((wData & 0xFF) << 24)) #define IX_OSAL_SWAP_LONG(wData) ((wData >> 24) | (((wData >> 16) & 0xFF) << 8) | (((wData >> 8) & 0xFF) << 16) | ((wData & 0xFF) << 24))
@ -172,7 +170,6 @@ typedef struct _IxOsalMemoryMap
UINT32 size; /**< size of the map */ UINT32 size; /**< size of the map */
UINT32 virtualAddress; /**< virtual address of the zone; must be predefined UINT32 virtualAddress; /**< virtual address of the zone; must be predefined
in the global memory map for static maps and has in the global memory map for static maps and has
to be NULL for dynamic maps (populated on allocation) to be NULL for dynamic maps (populated on allocation)
@ -318,7 +315,6 @@ ixOsalIoMemPhysToVirt (UINT32 physicalAddress, UINT32 coherency);
#define IX_OSAL_MMAP_PHYS_TO_VIRT(physAddr) \ #define IX_OSAL_MMAP_PHYS_TO_VIRT(physAddr) \
ixOsalIoMemPhysToVirt(physAddr, IX_OSAL_COMPONENT_MAPPING) ixOsalIoMemPhysToVirt(physAddr, IX_OSAL_COMPONENT_MAPPING)
/** /**
* @} IxOsalIoMem * @} IxOsalIoMem
*/ */

2
cpu/ixp/npe/include/IxOsalOsAssert.h
View File

@ -7,4 +7,4 @@
while(1); \ while(1); \
} }
#endif // IxOsalOsAssert_H #endif /* IxOsalOsAssert_H */

4
cpu/ixp/npe/include/IxOsalOsBufferMgt.h
View File

@ -55,7 +55,7 @@
#include "IxOsalBufferMgtDefault.h" #include "IxOsalBufferMgtDefault.h"
#if 0 // FIXME #if 0 /* FIXME */
/* Define os-specific buffer macros for subfields */ /* Define os-specific buffer macros for subfields */
#define IX_OSAL_OSBUF_MDATA(osBufPtr) IX_OSAL_MBUF_MDATA(osBufPtr) #define IX_OSAL_OSBUF_MDATA(osBufPtr) IX_OSAL_MBUF_MDATA(osBufPtr)
( ((M_BLK *) osBufPtr)->m_data ) ( ((M_BLK *) osBufPtr)->m_data )
@ -91,6 +91,6 @@
} \ } \
} }
#endif // FIXME #endif /* FIXME */
#endif /* #define IX_OSAL_OS_BUFFER_MGT_H */ #endif /* #define IX_OSAL_OS_BUFFER_MGT_H */

6
cpu/ixp/npe/include/IxOsalOsTypes.h
View File

@ -17,7 +17,7 @@ typedef u16 USHORT;
typedef u8 UCHAR; typedef u8 UCHAR;
typedef u32 BOOL; typedef u32 BOOL;
#if 0 // FIXME #if 0 /* FIXME */
/* Default stack limit is 10 KB */ /* Default stack limit is 10 KB */
#define IX_OSAL_OS_THREAD_DEFAULT_STACK_SIZE (10240) #define IX_OSAL_OS_THREAD_DEFAULT_STACK_SIZE (10240)
@ -31,7 +31,7 @@ typedef u32 BOOL;
/* Thread maximum priority (0 - 255). 0 - highest priority */ /* Thread maximum priority (0 - 255). 0 - highest priority */
#define IX_OSAL_OS_MAX_THREAD_PRIORITY (255) #define IX_OSAL_OS_MAX_THREAD_PRIORITY (255)
#endif // FIXME #endif /* FIXME */
#define IX_OSAL_OS_WAIT_FOREVER (-1L) #define IX_OSAL_OS_WAIT_FOREVER (-1L)
#define IX_OSAL_OS_WAIT_NONE 0 #define IX_OSAL_OS_WAIT_NONE 0
@ -57,4 +57,4 @@ typedef struct
} IxOsalOsMessageQueue; } IxOsalOsMessageQueue;
#endif // IxOsalOsTypes_H #endif /* IxOsalOsTypes_H */

1
lib_arm/_ashldi3.S
View File

@ -44,4 +44,3 @@ __ashldi3:
orrmi ah, ah, al, lsr ip orrmi ah, ah, al, lsr ip
mov al, al, lsl r2 mov al, al, lsl r2
mov pc, lr mov pc, lr

1
lib_arm/_ashrdi3.S
View File

@ -44,4 +44,3 @@ __ashrdi3:
orrmi al, al, ah, lsl ip orrmi al, al, ah, lsl ip
mov ah, ah, asr r2 mov ah, ah, asr r2
mov pc, lr mov pc, lr