Commit e844176c authored by Erik von Reis's avatar Erik von Reis
Browse files

remove the word 'slave' from the source. A couple of names in header files...

remove the word 'slave' from the source.  A couple of names in header files were changed.  For the most part the word 'secondary' was used in place of 'slave'
parent 6b9eed5b
......@@ -152,7 +152,7 @@
/* */
/* External Procedure Name: gpsMaster */
/* */
/* Procedure Description: True if GPS master, false if slave board */
/* Procedure Description: True if GPS master, false if secondary board */
/* */
/* Procedure Arguments: board ID */
/* */
......@@ -296,7 +296,7 @@
}
}
}
else { /* gps slave board or ignore year */
else { /* gps secondary board or ignore year */
if (currentYear == 0) {
struct tm utc; /* utc time from clock */
#if 0 && defined(OS_VXWORKS) && defined(PROCESSOR_BAJA47)
......@@ -329,7 +329,7 @@
}
currentYear = 1900 + utc.tm_year;
/*currentYear = 2004;*/
/* write year info to gps board if slave */
/* write year info to gps board if secondary */
if (!gpsMaster (ID) &&
setYearInformation (0, currentYear) != 0) {
currentYear = 0;
......@@ -497,7 +497,7 @@
}
else {
printf ("Brandywine syncclock32 (GPS %s) installed at %x\n",
gpsMaster(ID) ? "master" : "slave", (int) addr);
gpsMaster(ID) ? "primary" : "secondary", (int) addr);
}
/* set real-time clock to UTC */
......@@ -506,7 +506,7 @@
taskDelay (60);
/* wait until synchronized to input */
/* set the year information if a slave */
/* set the year information if a secondary */
if (!gpsMaster (ID)) {
/* set year */
if (year != NULL) {
......
......@@ -240,7 +240,7 @@ extern "C" {
/** Returns true if board is a GPS master.
@param ID board ID
@return true of master, false if slave
@return true of master
@author DS, July 98
@see GPS clock API
************************************************************************/
......@@ -249,7 +249,7 @@ extern "C" {
/** Initializes the GPS board. This routine initializes the
VME-SYNCCLOK32 board and sets the year information for IRIG-B
slave modules. If a NULL pointer is provided for the year
secondary modules. If a NULL pointer is provided for the year
information, neither the year, nor the leap year information
is set. Master boards ignore the provided year information.
......@@ -336,7 +336,7 @@ extern "C" {
/** Returns GPS information. This routine returns the number of
satellites, longitude, latitude, altitude, speed and direction.
This routine fails for slave boards. If a NULL pointer is
This routine fails for secondary boards. If a NULL pointer is
specified, only the number of tracked satellites is returned.
@param ID board ID
......
......@@ -548,7 +548,7 @@ extern "C" {
/* base address - base address of board */
/* address modifier - VME address modifier of board */
/* master - if non-zero indicates a baord with a GPS receiver, */
/* otherwise it is just an IRIG B slave */
/* otherwise it is just an IRIG B secondary */
/* int source - source of interrupt */
/* type 0 - interrupt generated @ 16Hz by other Baja */
/* type 1 - interrupt generated @ 64Hz by GPS board */
......
......@@ -24,7 +24,7 @@ ICS115_WAIT_DAC_INT,
ICS115_WAIT_VME_INT,
ICS115_SET_VME_INTERRUPT, /* 120 */
ICS115_SET_VME_IVECTOR,
ICS115_SET_VME_A64_SLAVE,
ICS115_SET_VME_A64_SECONDARY,
ICS115_VME_DMA,
ICS115_DIAG_ACCESS
};
......@@ -44,7 +44,7 @@ ICS115_DIAG_ACCESS
#define ICS115_MAX_DEV 20
#define ICS115_MASTER 0
#define ICS115_SLAVE 1
#define ICS115_SECONDARY 1
#define ICS115_DISABLE 0
#define ICS115_ENABLE 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment