Skip to content

Commit

Permalink
[nes]: PLATFORM changes ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@nes-repo
nes-repo committed Sep 11, 2015
1 parent cccb093 commit ac356d9
Show file tree
Hide file tree
Showing 19 changed files with 480 additions and 244 deletions.
39 changes: 26 additions & 13 deletions bridge/bridge_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,40 @@ static xThreadInfo_t oBridgeThread =


void *
bridge_main (
void *pvArgv)
bridge_main (void *pvArgv)
{
bridgeUtilsInit ();
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

ieee8021PbMib_init ();
ieee8021PbbMib_init ();
ieee8021PbbTeMib_init ();

if (xThread_create (&oBridgeThread) == NULL)
switch (u32ModuleOp)
{
Bridge_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
bridgeUtilsInit ();

ieee8021PbMib_init ();
ieee8021PbbMib_init ();
ieee8021PbbTeMib_init ();

if (xThread_create (&oBridgeThread) == NULL)
{
Bridge_log (xLog_err_c, "xThread_create() failed\n");
goto bridge_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

bridge_main_cleanup:

return pvRetCode;
}

void *
bridge_start (
void *pvArgv)
bridge_start (void *pvArgv)
{
while (1)
{
Expand Down
33 changes: 23 additions & 10 deletions cfm/cfm_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,37 @@ static xThreadInfo_t oCfmThread =


void *
cfm_main (
void *pvArgv)
cfm_main (void *pvArgv)
{
ieee8021CfmMib_init ();
ieee8021CfmV2Mib_init ();
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

if (xThread_create (&oCfmThread) == NULL)
switch (u32ModuleOp)
{
Cfm_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
ieee8021CfmMib_init ();
ieee8021CfmV2Mib_init ();

if (xThread_create (&oCfmThread) == NULL)
{
Cfm_log (xLog_err_c, "xThread_create() failed\n");
goto cfm_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

cfm_main_cleanup:

return pvRetCode;
}

void *
cfm_start (
void *pvArgv)
cfm_start (void *pvArgv)
{
while (1)
{
Expand Down
31 changes: 22 additions & 9 deletions entity/entity_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,36 @@ static xThreadInfo_t oEntityThread =


void *
entity_main (
void *pvArgv)
entity_main (void *pvArgv)
{
entityMIB_init ();
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

if (xThread_create (&oEntityThread) == NULL)
switch (u32ModuleOp)
{
Entity_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
entityMIB_init ();

if (xThread_create (&oEntityThread) == NULL)
{
Entity_log (xLog_err_c, "xThread_create() failed\n");
goto entity_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

entity_main_cleanup:

return pvRetCode;
}

void *
entity_start (
void *pvArgv)
entity_start (void *pvArgv)
{
while (1)
{
Expand Down
43 changes: 28 additions & 15 deletions ethernet/ethernet_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,42 @@ static xThreadInfo_t oEthernetThread =


void *
ethernet_main (
void *pvArgv)
ethernet_main (void *pvArgv)
{
ethernetUtilsInit ();
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

ieee8021BridgeMib_init ();
ieee8021QBridgeMib_init ();
neIeee8021BridgeMIB_init ();
mefUniEvcMib_init ();
mefEnniOvcMib_init ();

if (xThread_create (&oEthernetThread) == NULL)
switch (u32ModuleOp)
{
Ethernet_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
ethernetUtilsInit ();

ieee8021BridgeMib_init ();
ieee8021QBridgeMib_init ();
neIeee8021BridgeMIB_init ();
mefUniEvcMib_init ();
mefEnniOvcMib_init ();

if (xThread_create (&oEthernetThread) == NULL)
{
Ethernet_log (xLog_err_c, "xThread_create() failed\n");
goto ethernet_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

ethernet_main_cleanup:

return pvRetCode;
}

void *
ethernet_start (
void *pvArgv)
ethernet_start (void *pvArgv)
{
while (1)
{
Expand Down
29 changes: 21 additions & 8 deletions hal/hal_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,34 @@ static xThreadInfo_t oHalThread =


void *
hal_main (
void *pvArgv)
hal_main (void *pvArgv)
{
if (xThread_create (&oHalThread) == NULL)
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

switch (u32ModuleOp)
{
Hal_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
if (xThread_create (&oHalThread) == NULL)
{
Hal_log (xLog_err_c, "xThread_create() failed\n");
goto hal_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

hal_main_cleanup:

return pvRetCode;
}

void *
hal_start (
void *pvArgv)
hal_start (void *pvArgv)
{
while (1)
{
Expand Down
31 changes: 22 additions & 9 deletions if/if_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,36 @@ static xThreadInfo_t oIfThread =


void *
if_main (
void *pvArgv)
if_main (void *pvArgv)
{
ifMIB_init ();
register void *pvRetCode = NULL;
register uint32_t u32ModuleOp = (uintptr_t) pvArgv;

if (xThread_create (&oIfThread) == NULL)
switch (u32ModuleOp)
{
If_log (xLog_err_c, "xThread_create() failed\n");
return NULL;
default:
break;

case ModuleOp_start_c:
ifMIB_init ();

if (xThread_create (&oIfThread) == NULL)
{
If_log (xLog_err_c, "xThread_create() failed\n");
goto if_main_cleanup;
}
break;
}

return NULL;
pvRetCode = (void*) true;

if_main_cleanup:

return pvRetCode;
}

void *
if_start (
void *pvArgv)
if_start (void *pvArgv)
{
while (1)
{
Expand Down
51 changes: 31 additions & 20 deletions include/switch_ext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,29 @@ enum
ModuleId_ted_c,
ModuleId_mpls_c,
ModuleId_tcpUdp_c,
ModuleId_count_c,

ModuleOp_init_c = 1,
ModuleOp_start_c,
ModuleOp_reset_c,
};

typedef void *(ModuleRoutine_t) (void *);

typedef struct ModuleInfo_t
{
uint32_t u32ModuleId;
ModuleRoutine_t *poInit;
ModuleRoutine_t *poStart;
ModuleRoutine_t *poReset;
uint32_t u32Id;
ModuleRoutine_t *poControl;
} ModuleInfo_t;


#ifdef __SYSTEM_MAIN_C__

#include "lib/snmp.h"

#endif // __SYSTEM_MAIN_C__


#ifdef __SWITCH_MAIN_C__

#include "snmp_ext.h"
Expand All @@ -98,22 +109,22 @@ const char *pcSwitchContact = SWITCH_CONTACT;

static ModuleInfo_t aoModuleList[] =
{
{ModuleId_snmp_c, NULL, &snmp_main, NULL},
{ModuleId_system_c, &system_init, &system_main, NULL},
{ModuleId_if_c, NULL, &if_main, NULL},
{ModuleId_entity_c, NULL, &entity_main, NULL},
{ModuleId_hal_c, NULL, &hal_main, NULL},
{ModuleId_ethernet_c, NULL, &ethernet_main, NULL},
{ModuleId_lag_c, NULL, &lag_main, NULL},
{ModuleId_bridge_c, NULL, &bridge_main, NULL},
{ModuleId_cfm_c, NULL, &cfm_main, NULL},
{ModuleId_isis_c, NULL, &isis_main, NULL},
{ModuleId_stp_c, NULL, &stp_main, NULL},
{ModuleId_spb_c, NULL, &spb_main, NULL},
{ModuleId_inet_c, NULL, &inet_main, NULL},
{ModuleId_ted_c, NULL, &ted_main, NULL},
{ModuleId_mpls_c, NULL, &mpls_main, NULL},
{ModuleId_tcpUdp_c, NULL, &tcpUdp_main, NULL},
{ModuleId_snmp_c, &snmp_main},
{ModuleId_system_c, &system_main},
{ModuleId_if_c, &if_main},
{ModuleId_entity_c, &entity_main},
{ModuleId_hal_c, &hal_main},
{ModuleId_ethernet_c, &ethernet_main},
{ModuleId_lag_c, &lag_main},
{ModuleId_bridge_c, &bridge_main},
{ModuleId_cfm_c, &cfm_main},
{ModuleId_isis_c, &isis_main},
{ModuleId_stp_c, &stp_main},
{ModuleId_spb_c, &spb_main},
{ModuleId_inet_c, &inet_main},
{ModuleId_ted_c, &ted_main},
{ModuleId_mpls_c, &mpls_main},
{ModuleId_tcpUdp_c, &tcpUdp_main},
};

#endif // __SWITCH_MAIN_C__
Expand Down

0 comments on commit ac356d9

Please sign in to comment.