Compare commits
4 commits
82bd01ed92
...
5a54208178
| Author | SHA1 | Date | |
|---|---|---|---|
 DataHoarder
|
5a54208178 | ||
|
DataHoarder
|
160148d755 | ||
|
DataHoarder
|
89b0a0ea96 | ||
|
DataHoarder
|
4e680dd36e |
|
|
@ -8,7 +8,7 @@ AM_CFLAGS = -std=c99
|
|||
-Wno-unused-parameter \
|
||||
-Wstrict-prototypes \
|
||||
-Wno-variadic-macros \
|
||||
-D_FM_ARCH_x86_64 \
|
||||
-D_FM_ARCH_64 \
|
||||
-O1 \
|
||||
-Wno-override-init \
|
||||
-DFM_SUPPORT_FM10000 \
|
||||
|
|
|
|||
|
|
@ -46,5 +46,5 @@ fm_status fm10000PTIReceive(fm_int sw,
|
|||
fm_int length,
|
||||
fm_int * dataLength);
|
||||
|
||||
#endif /* FM_FM10000_GENERIC_PTI_H */
|
||||
#endif /* __FM_FM10000_GENERIC_PTI_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ typedef unsigned int fm_uint;
|
|||
* Intended to be the same size as pointer type
|
||||
* so casting between pointer and integer can be
|
||||
* done without warnings. */
|
||||
#ifdef _FM_ARCH_x86_64
|
||||
#ifdef _FM_ARCH_64
|
||||
typedef unsigned long long fm_uintptr;
|
||||
#else
|
||||
typedef unsigned long fm_uintptr;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ AM_CFLAGS = -std=c99
|
|||
-Wno-unused-parameter \
|
||||
-Wstrict-prototypes \
|
||||
-Wno-variadic-macros \
|
||||
-D_FM_ARCH_x86_64 \
|
||||
-D_FM_ARCH_64 \
|
||||
-O1 \
|
||||
-Wno-override-init \
|
||||
-DFM_SUPPORT_FM10000 \
|
||||
|
|
|
|||
|
|
@ -1196,7 +1196,7 @@ fm_status fm10000CreateCanonicalCamEntries(fm_int sw,
|
|||
continue;
|
||||
}
|
||||
|
||||
if ( (startGlort == (startGlort & ~(size-1))) )
|
||||
if ( startGlort == (startGlort & ~(size-1)) )
|
||||
{
|
||||
if (numCamNeeded >= FM10000_CANONICAL_GLORT_CAM_ENTRIES)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1643,7 +1643,7 @@ fm_status fm10000DbgDumpMirror(fm_int sw)
|
|||
fm_bool vlanFound;
|
||||
fm10000_mirrorCfg config;
|
||||
fm_fm10000PortMirrorGroup *grpExt;
|
||||
void * nextValue;
|
||||
fm_mirrorVlanType nextValue;
|
||||
|
||||
switchPtr = GET_SWITCH_PTR(sw);
|
||||
switchExt = GET_SWITCH_EXT(sw);
|
||||
|
|
@ -1707,12 +1707,12 @@ fm_status fm10000DbgDumpMirror(fm_int sw)
|
|||
|
||||
vlanFound = FALSE;
|
||||
for (fmTreeIterInit(&itVlan, &grp->vlan1s) ;
|
||||
(err = fmTreeIterNext(&itVlan, &vlanId, &nextValue)) ==
|
||||
(err = fmTreeIterNext(&itVlan, &vlanId, (void**)&nextValue)) ==
|
||||
FM_OK ; )
|
||||
{
|
||||
vlanType = (fm_mirrorVlanType) nextValue;
|
||||
vlanType = nextValue;
|
||||
|
||||
if ( (vlanType == FM_MIRROR_VLAN_EGRESS) )
|
||||
if ( vlanType == FM_MIRROR_VLAN_EGRESS )
|
||||
{
|
||||
FM_LOG_PRINT("%lld ", vlanId);
|
||||
vlanFound = TRUE;
|
||||
|
|
|
|||
|
|
@ -3146,7 +3146,7 @@ static fm_status SwapArpHandles(fm_int sw,
|
|||
ppArpBlkCtrl1 = &((*pSwitchExt->pNextHopSysCtrl->ppArpBlkCtrlTab)[arpBlockHndl1]);
|
||||
ppArpBlkCtrl2 = &((*pSwitchExt->pNextHopSysCtrl->ppArpBlkCtrlTab)[arpBlockHndl2]);
|
||||
|
||||
if ((*ppArpBlkCtrl1 == NULL) || (*ppArpBlkCtrl1 == NULL))
|
||||
if ((*ppArpBlkCtrl1 == NULL) || (*ppArpBlkCtrl2 == NULL))
|
||||
{
|
||||
err = FM_ERR_INVALID_ARGUMENT;
|
||||
FM_LOG_ERROR(FM_LOG_CAT_ROUTING, "Null ARP Block control\n");
|
||||
|
|
|
|||
|
|
@ -15923,7 +15923,7 @@ fm_status fm10000GetPortEyeDiagram(fm_int sw,
|
|||
err = FM_ERR_INVALID_PORT_LANE;
|
||||
}
|
||||
/* Validate logical port ID */
|
||||
/* This validation is forced for the time being */
|
||||
/* TODO: This validation is forced for the time being */
|
||||
else if (ValidatePort(sw, port) == FALSE && 0)
|
||||
{
|
||||
err = FM_ERR_INVALID_PORT;
|
||||
|
|
|
|||
|
|
@ -368,16 +368,16 @@ static fm_status SetFabricLoopbackFlags(fm_int sw,
|
|||
switch ( lane )
|
||||
{
|
||||
case 0:
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_0, !enableFabricLoopback);
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_0, (!enableFabricLoopback));
|
||||
break;
|
||||
case 1:
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_1, !enableFabricLoopback);
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_1, (!enableFabricLoopback));
|
||||
break;
|
||||
case 2:
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_2, !enableFabricLoopback);
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_2, (!enableFabricLoopback));
|
||||
break;
|
||||
case 3:
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_3, !enableFabricLoopback);
|
||||
FM_SET_BIT(eplCfgA, FM10000_EPL_CFG_A, Active_3, (!enableFabricLoopback));
|
||||
break;
|
||||
default:
|
||||
err = FM_FAIL;
|
||||
|
|
|
|||
|
|
@ -2854,7 +2854,7 @@ static fm_status SerdesGetEyeSimpleMetric(fm_int sw,
|
|||
|
||||
value1 = (value1 & 0x8000) ? value1 | 0xffff0000 : value1;
|
||||
value2 = (value2 & 0x8000) ? value2 | 0xffff0000 : value2;
|
||||
vDiff = abs(value2 - value1);
|
||||
vDiff = abs((int64_t)value2 - (int64_t)value1);
|
||||
|
||||
results = (vDiff < results)? vDiff : results;
|
||||
}
|
||||
|
|
@ -9482,7 +9482,7 @@ fm_status fm10000SerdesDfeTuningCheckICalConvergence(fm_int sw,
|
|||
|
||||
value1 = (value1 & 0x8000) ? value1 | 0xffff0000 : value1;
|
||||
value2 = (value2 & 0x8000) ? value2 | 0xffff0000 : value2;
|
||||
vDiff = abs(value2 - value1);
|
||||
vDiff = abs((int64_t)value2 - (int64_t)value1);
|
||||
|
||||
|
||||
if ( vDiff >= pLaneExt->dfeExt.dfeDataLevThreshold)
|
||||
|
|
|
|||
|
|
@ -2136,8 +2136,8 @@ fm_status fm10000AddStormCtrlAction(fm_int sw,
|
|||
|
||||
FM_LOG_ENTRY(FM_LOG_CAT_STORM,
|
||||
"sw = %d, stormController = %d, action(%p) = (%s, %d)\n",
|
||||
sw, stormController, (void *) action,
|
||||
fmStormCondTypeToText(action->type), action->param );
|
||||
sw, stormController, (void *) action,
|
||||
fmStormActionTypeToText(action->type), action->param );
|
||||
|
||||
if ( (stormController >= FM10000_MAX_NUM_STORM_CTRL) ||
|
||||
(stormController < 0) )
|
||||
|
|
@ -2214,8 +2214,8 @@ fm_status fm10000DeleteStormCtrlAction(fm_int sw,
|
|||
|
||||
FM_LOG_ENTRY(FM_LOG_CAT_STORM,
|
||||
"sw = %d, stormController = %d, action(%p) = (%s, %d)\n",
|
||||
sw, stormController, (void *) action,
|
||||
fmStormCondTypeToText(action->type), action->param );
|
||||
sw, stormController, (void *) action,
|
||||
fmStormActionTypeToText(action->type), action->param );
|
||||
|
||||
if ( (stormController >= FM10000_MAX_NUM_STORM_CTRL) ||
|
||||
(stormController < 0) )
|
||||
|
|
|
|||
|
|
@ -2236,7 +2236,7 @@ fm_status fmGetMirrorVlanFirstInternal(fm_int sw,
|
|||
fm_status err;
|
||||
fm_treeIterator itVlan;
|
||||
fm_uint64 key;
|
||||
void *value;
|
||||
fm_mirrorVlanType value;
|
||||
fm_tree * vlanTree;
|
||||
|
||||
FM_LOG_ENTRY_API(FM_LOG_CAT_MIRROR,
|
||||
|
|
@ -2266,13 +2266,13 @@ fm_status fmGetMirrorVlanFirstInternal(fm_int sw,
|
|||
vlanTree = (vlanSel == FM_VLAN_SELECT_VLAN2) ? &grp->vlan2s : &grp->vlan1s;
|
||||
|
||||
fmTreeIterInit(&itVlan, vlanTree);
|
||||
err = fmTreeIterNext(&itVlan, &key, &value);
|
||||
err = fmTreeIterNext(&itVlan, &key, (void**)&value);
|
||||
if (err == FM_ERR_NO_MORE)
|
||||
{
|
||||
err = FM_ERR_NO_VLANS_IN_MIRROR_GROUP;
|
||||
}
|
||||
*firstID = key;
|
||||
*direction = (fm_mirrorVlanType) value;
|
||||
*direction = value;
|
||||
|
||||
ABORT:
|
||||
DROP_MIRROR_LOCK(sw);
|
||||
|
|
@ -2448,7 +2448,7 @@ fm_status fmGetMirrorVlanNextInternal(fm_int sw,
|
|||
fm_status err;
|
||||
fm_treeIterator itVlan;
|
||||
fm_uint64 key;
|
||||
void * value;
|
||||
fm_mirrorVlanType value;
|
||||
fm_tree * vlanTree;
|
||||
|
||||
FM_LOG_ENTRY_API(FM_LOG_CAT_MIRROR,
|
||||
|
|
@ -2485,13 +2485,13 @@ fm_status fmGetMirrorVlanNextInternal(fm_int sw,
|
|||
}
|
||||
else
|
||||
{
|
||||
err = fmTreeIterNext(&itVlan, &key, &value);
|
||||
err = fmTreeIterNext(&itVlan, &key, (void**) &value);
|
||||
if (err == FM_ERR_NO_MORE)
|
||||
{
|
||||
err = FM_ERR_NO_VLANS_IN_MIRROR_GROUP;
|
||||
}
|
||||
*nextID = key;
|
||||
*direction = (fm_mirrorVlanType) value;
|
||||
*direction = value;
|
||||
}
|
||||
|
||||
ABORT:
|
||||
|
|
|
|||
|
|
@ -2186,8 +2186,8 @@ fm_int fmComparePortAttributes(fm_int attrType, void *attr1, void *attr2)
|
|||
case FM_TYPE_PAUSE_PACING_TIME:
|
||||
retVal = ( (( (fm_pausePacingTime *)attr1)->pauseClass ==
|
||||
( (fm_pausePacingTime *)attr2)->pauseClass) &&
|
||||
(( (fm_pausePacingTime *)attr1)->pauseClass ==
|
||||
( (fm_pausePacingTime *)attr2)->pauseClass) ) ?
|
||||
(( (fm_pausePacingTime *)attr1)->timeNs ==
|
||||
( (fm_pausePacingTime *)attr2)->timeNs) ) ?
|
||||
0 : 1;
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue