Skip to content

Commit

Permalink
Removed old VxWorks/RTEMS code and created separate contributors file
Browse files Browse the repository at this point in the history
  • Loading branch information
timcanham committed Jul 6, 2017
1 parent ba65026 commit f5b4499
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 84 deletions.
34 changes: 34 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
JPL Contributors to the F` Software Framework:

* Adams, Derek
* Bocchino, Robert
* Campuzano, Brian
* Canham, Timothy
* Chase, Matthew
* Chen, Victor
* Day, Leonard
* Dinkle, Kevin
* Gandhi, Gorang
* Hofman, James
* Kooi, David
* Klemm, Rogers
* Kubiak, Gerak
* Levison, Jeffrey
* Manglapus, Lloyd
* Merewether, Eugene
* Nicolich, Eric
* Nowicki, Robert
* Ortega, Kevin
* Pandian, Prashanth
* Reder, Leonard
* Rizvi, Aadil
* Roche, Michael
* Sinha, Sanchit
* Starch, Michael
* Perez, Joseph
* Shenker, Boris
* Tuszynski, Marek
* Uchenik, Igor
* Watney, Garth
* Wang, Eric
* Wong, Vincent
84 changes: 0 additions & 84 deletions Ref/Top/Topology.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,28 +398,16 @@ void print_usage() {
}


#if defined TGT_OS_TYPE_LINUX || TGT_OS_TYPE_DARWIN

//#include <mqueue.h>
#include <signal.h>
#include <stdio.h>

extern "C" {
int main(int argc, char* argv[]);
};

volatile sig_atomic_t terminate = 0;

static void sighandler(int signum) {
terminate = 1;
}

int main(int argc, char* argv[]) {
// mq_unlink("/QP_1KhzRateGroup");
// mq_unlink("/QP_100hzRateGroup");
// mq_unlink("/QP_1hzRateGroup");
// mq_unlink("/QP_CmdComponent");
// return 0;
U32 port_number;
I32 option;
char *hostname;
Expand Down Expand Up @@ -473,75 +461,3 @@ int main(int argc, char* argv[]) {

return 0;
}

#endif

#ifdef TGT_OS_TYPE_VXWORKS

#include "Fw/Types/VxWorks/VxWorksLogAssert.hpp"

extern "C" {
void go(int portNum, char* hostname);
}

void cycleTask(void* arg) {
runcycles(-1);
}

Os::Task cycleTaskObj;

Fw::VxWorksLogAssertHook logAssertHook;

void go(int portNum, char* hostname) {
logAssertHook.registerHook();
constructApp(portNum,hostname);
// start thread cycling
Fw::EightyCharString taskName("Cycler");
if (cycleTaskObj.start(taskName,CYCLER_TASK,160, 10*1024,cycleTask,0) != Os::Task::TASK_OK) {
printf("Failed to start cycler task!\n");
}

Os::Task::delay(10000);
}

#endif

#ifdef TGT_OS_TYPE_RTEMS

#include <stdio.h>
#include <rtems/rtems_config.h>


rtems_task Init (rtems_task_argument ignored) {

(void) printf("Constructing Architecture\n");

// *** Probably broken. Hasn't been tested in a few releases ***

constructApp();

int cycle = 0;

while (cycle != 10) {
Os::Task::delay(1000);
(void) printf("Cycle %d\n",cycle);
runcycles(1);
cycle++;
}

// stop tasks
rateGroup1KhzComp.exit();
rateGroup100hzComp.exit();
rateGroup1hzComp.exit();
blockDrv.exit();

// Give time for threads to exit
(void) printf("Waiting for threads...\n");
Os::Task::delay(1000);

(void) printf("Exiting...\n");
exit(0);
}

#endif

0 comments on commit f5b4499

Please sign in to comment.