GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-17 12:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
IxEthDBPortMap portMap;
// clear all ports from port map
/* clear all ports from port map */
memset(portMap, 0, sizeof (portMap));
// include portID in port map
/* include portID in port map */
portMap[portID / 8] = 1 << (portID % 8);
@endverbatim
*

20
cpu/ixp/npe/include/IxEthDBQoS.h
View file

@ -120,16 +120,16 @@ UINT8 ixEthDBTrafficClassDefinitions[][3] =
* @brief IEEE 802.1Q recommended QoS Priority => traffic class maps
*
* @verbatim
Number of available traffic classes
1 2 3 4 5 6 7 8
QoS Priority
0 0 0 0 1 1 1 1 2
1 0 0 0 0 0 0 0 0
2 0 0 0 0 0 0 0 1
3 0 0 0 1 1 2 2 3
4 0 1 1 2 2 3 3 4
5 0 1 1 2 3 4 4 5
6 0 1 2 3 4 5 5 6
Number of available traffic classes
1 2 3 4 5 6 7 8
QoS Priority
0 0 0 0 1 1 1 1 2
1 0 0 0 0 0 0 0 0
2 0 0 0 0 0 0 0 1
3 0 0 0 1 1 2 2 3
4 0 1 1 2 2 3 3 4
5 0 1 1 2 3 4 4 5
6 0 1 2 3 4 5 5 6
7 0 1 2 3 4 5 6 7
@endverbatim

4
cpu/ixp/npe/include/IxNpeDlNpeMgr_p.h
View file

@ -174,8 +174,8 @@ ixNpeDlNpeMgrImageLoad (IxNpeDlNpeId npeId, UINT32 *imageCodePtr,
*
* @return
* - IX_SUCCESS if the operation was successful
* - IX_FAIL if the operation failed
* - IX_NPEDL_CRITICAL_NPE_ERR if the operation failed due to NPE hang
* - IX_FAIL if the operation failed
* - IX_NPEDL_CRITICAL_NPE_ERR if the operation failed due to NPE hang
*/
IX_STATUS
ixNpeDlNpeMgrNpeReset (IxNpeDlNpeId npeId);

60
cpu/ixp/npe/include/IxOsServicesComponents.h
View file

@ -62,10 +62,10 @@
#define ix_i2c 40
#define ix_integration_sspAcc 41
#define ix_integration_i2c 42
#define ix_osal 43
#define ix_integration_parityENAcc 44
#define ix_integration_timeSyncAcc 45
#define ix_osal 43
#define ix_integration_parityENAcc 44
#define ix_integration_timeSyncAcc 45
/***************************
* timeSyncAcc
***************************/
@ -106,29 +106,29 @@
#endif /* codelets_parityENAcc */
#endif /* IxOsServicesComponents_H */
/***************************
* integration_timeSyncAcc
***************************/
#if (IX_COMPONENT_NAME == ix_integration_timeSyncAcc)
#if defined (IX_OSSERV_VXWORKS_LE)
#define CSR_LE_DATA_COHERENT_MAPPING
#endif /* IX_OSSERV_VXWORKS_LE */
#endif /* integration_timeSyncAcc */
/***************************
* integration_parityENAcc
***************************/
#if (IX_COMPONENT_NAME == ix_integration_parityENAcc)
#if defined (IX_OSSERV_VXWORKS_LE)
#define CSR_LE_DATA_COHERENT_MAPPING
#endif /* IX_OSSERV_VXWORKS_LE */
#endif /* integration_parityENAcc */
/***************************
* integration_timeSyncAcc
***************************/
#if (IX_COMPONENT_NAME == ix_integration_timeSyncAcc)
#if defined (IX_OSSERV_VXWORKS_LE)
#define CSR_LE_DATA_COHERENT_MAPPING
#endif /* IX_OSSERV_VXWORKS_LE */
#endif /* integration_timeSyncAcc */
/***************************
* integration_parityENAcc
***************************/
#if (IX_COMPONENT_NAME == ix_integration_parityENAcc)
#if defined (IX_OSSERV_VXWORKS_LE)
#define CSR_LE_DATA_COHERENT_MAPPING
#endif /* IX_OSSERV_VXWORKS_LE */
#endif /* integration_parityENAcc */

2
cpu/ixp/npe/include/IxOsalAssert.h
View file

@ -60,7 +60,7 @@
* will not be compiled out.
* N.B. will result in a system crash if it is false.
*/
#define IX_OSAL_ASSERT(c) IX_OSAL_OS_ASSERT(c)
#define IX_OSAL_ASSERT(c) IX_OSAL_OS_ASSERT(c)
/**

50
cpu/ixp/npe/include/IxOsalIoMem.h
View file

@ -63,13 +63,12 @@
* @{
*/
/* Low-level conversion macros - DO NOT USE UNLESS ABSOLUTELY NEEDED */
#ifndef __wince
/*
* Private function to swap word*//*
* Private function to swap word
*/
#ifdef __XSCALE__
static __inline__ UINT32
@ -91,7 +90,6 @@ ixOsalCoreWordSwap (UINT32 wordIn)
return wordOut;
}
#define IX_OSAL_SWAP_LONG(wData) (ixOsalCoreWordSwap(wData))
#else
@ -149,7 +147,7 @@ typedef enum
/**
* @ingroup IxOsalIoMem
* @enum IxOsalMapEndianessType
* @brief This is an emum for OSAL I/O mem Endianess and Coherency mode.
* @brief This is an emum for OSAL I/O mem Endianess and Coherency mode.
*/
typedef enum
{
@ -172,10 +170,9 @@ typedef struct _IxOsalMemoryMap
UINT32 size; /**< size of the map */
UINT32 virtualAddress; /**< virtual address of the zone; must be predefined
in the global memory map for static maps and has
to be NULL for dynamic maps (populated on allocation)
UINT32 virtualAddress; /**< virtual address of the zone; must be predefined
in the global memory map for static maps and has
to be NULL for dynamic maps (populated on allocation)
*/
/*
* pointer to a map function called to map a dynamic map;
@ -245,12 +242,12 @@ ixOsalIoMemPhysToVirt (UINT32 physicalAddress, UINT32 coherency);
*
* @def IX_OSAL_MEM_MAP(physAddr, size)
*
* @brief Map an I/O mapped physical memory zone to virtual zone and return virtual
* pointer.
* @brief Map an I/O mapped physical memory zone to virtual zone and return virtual
* pointer.
* @param physAddr - the physical address
* @param size - the size
* @return start address of the virtual memory zone.
*
* @return start address of the virtual memory zone.
*
* @note This function maps an I/O mapped physical memory zone of the given size
* into a virtual memory zone accessible by the caller and returns a cookie -
* the start address of the virtual memory zone.
@ -260,23 +257,23 @@ ixOsalIoMemPhysToVirt (UINT32 physicalAddress, UINT32 coherency);
* finished using this zone (e.g. on driver unload) using the cookie as
* parameter.
* The IX_OSAL_READ/WRITE_LONG/SHORT macros should be used to read and write
* the mapped memory, adding the necessary offsets to the address cookie.
* the mapped memory, adding the necessary offsets to the address cookie.
*/
#define IX_OSAL_MEM_MAP(physAddr, size) \
ixOsalIoMemMap((physAddr), (size), IX_OSAL_COMPONENT_MAPPING)
/**
/**
* @ingroup IxOsalIoMem
*
* @def IX_OSAL_MEM_UNMAP(virtAddr)
*
* @brief Unmap a previously mapped I/O memory zone using virtual pointer obtained
* during the mapping operation.
* pointer.
* @brief Unmap a previously mapped I/O memory zone using virtual pointer obtained
* during the mapping operation.
* pointer.
* @param virtAddr - the virtual pointer to the zone to be unmapped.
* @return none
*
* @return none
*
* @note This function unmaps a previously mapped I/O memory zone using
* the cookie obtained in the mapping operation. The memory zone in question
* becomes unavailable to the caller once unmapped and the cookie should be
@ -288,37 +285,36 @@ ixOsalIoMemPhysToVirt (UINT32 physicalAddress, UINT32 coherency);
#define IX_OSAL_MEM_UNMAP(virtAddr) \
ixOsalIoMemUnmap ((virtAddr), IX_OSAL_COMPONENT_MAPPING)
/**
/**
* @ingroup IxOsalIoMem
*
* @def IX_OSAL_MMAP_VIRT_TO_PHYS(virtAddr)
*
* @brief This function Converts a virtual address into a physical
* address, including the dynamically mapped memory.
*
*
* @param virtAddr - virtual address to convert
* Return value: corresponding physical address, or NULL
* Return value: corresponding physical address, or NULL
*/
#define IX_OSAL_MMAP_VIRT_TO_PHYS(virtAddr) \
ixOsalIoMemVirtToPhys(virtAddr, IX_OSAL_COMPONENT_MAPPING)
/**
/**
* @ingroup IxOsalIoMem
*
* @def IX_OSAL_MMAP_PHYS_TO_VIRT(physAddr)
*
* @brief This function Converts a virtual address into a physical
* address, including the dynamically mapped memory.
*
*
* @param physAddr - physical address to convert
* Return value: corresponding virtual address, or NULL
*
* Return value: corresponding virtual address, or NULL
*
*/
#define IX_OSAL_MMAP_PHYS_TO_VIRT(physAddr) \
ixOsalIoMemPhysToVirt(physAddr, IX_OSAL_COMPONENT_MAPPING)
/**
* @} IxOsalIoMem
*/

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

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

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

@ -55,7 +55,7 @@
#include "IxOsalBufferMgtDefault.h"
#if 0 // FIXME
#if 0 /* FIXME */
/* Define os-specific buffer macros for subfields */
#define IX_OSAL_OSBUF_MDATA(osBufPtr) IX_OSAL_MBUF_MDATA(osBufPtr)
( ((M_BLK *) osBufPtr)->m_data )
@ -91,6 +91,6 @@
} \
}
#endif // FIXME
#endif /* FIXME */
#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 u32 BOOL;
#if 0 // FIXME
#if 0 /* FIXME */
/* Default stack limit is 10 KB */
#define IX_OSAL_OS_THREAD_DEFAULT_STACK_SIZE (10240)
@ -31,7 +31,7 @@ typedef u32 BOOL;
/* Thread maximum priority (0 - 255). 0 - highest priority */
#define IX_OSAL_OS_MAX_THREAD_PRIORITY (255)
#endif // FIXME
#endif /* FIXME */
#define IX_OSAL_OS_WAIT_FOREVER (-1L)
#define IX_OSAL_OS_WAIT_NONE 0
@ -57,4 +57,4 @@ typedef struct
} 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
mov al, al, lsl r2
mov pc, lr

1
lib_arm/_ashrdi3.S
View file

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