cmd.c

As with all files, rename the file, adding a preceding l (the letter after k and before m)

line# action
1 replace #include "includes.h" with #include "lincludes.h"
22 replace void ProcessCommand(char *cb) with void ProcessCommand(char *cb, double *cv)
25/td> insert rtl_irqstate_t state;
53 replace sscanf(cb,"AC%d",&sv); with sv = (unsigned short)floor(cv[0]);
57 replace SVPredicts(sv);with SVPredicts(sv,(int)7);
73 replace sscanf(cb,"CH%d",&active_channels); with active_channels = (unsigned short)floor(cv[0]);
76 replace PROTECT++; with rec_mutex_lock ((int)7);
83 replace PROTECT--; with rec_mutex_unlock ((int)7);
94 replace disable(); with rtl_no_interrupts(state);
133 remove enable(); with rtl_restore_interrupts(state);
155 replace sscanf(cb,"DS%d",&sv); with sv = (unsigned short)floor(cv[0]);
168 replace sscanf(cb,"EM%f",&elevation_mask); with elevation_mask = (float)cv[0];
290 replace sscanf(cb,"OE%lf",&OscErr); with OscErr = cv[0];
294 replace PROTECT++; with rec_mutex_lock ((int)7);
297 replace PROTECT--; with rec_mutex_unlock ((int)7);
306 replace disable(); with rtl_no_interrupts(state);
309 remove enable(); with rtl_restore_interrupts(state);
311 replace PROTECT++; with rec_mutex_lock ((int)7);
314 replace PROTECT--; with rec_mutex_unlock ((int)7);
327 replace sscanf(cb,"PM%f",&pdop_mask); with pdop_mask = (float)cv[0];
342 replace PROTECT++; with rec_mutex_lock ((int)7);
314 replace PROTECT--; with rec_mutex_unlock ((int)7);
353 remove if(PosStrToLatLonHgt(&cb[2],&dblrefllh)==TRUE) with if(PosStrToLatLonHgt(&cv[0],&dblrefllh)==TRUE)
369 remove sscanf(cb,"RS%d",&sv); with sv = (unsigned short)cv[0];
387 replace PROTECT++; with rec_mutex_lock ((int)7);
388 replace SaveAlmanacs(); with SaveAlmanacs((int)7);
389 replace PROTECT--; with rec_mutex_unlock ((int)7);
405 replace sscanf(&cb[2],"%2d %2d %2d",&d,&m,&y); with d = (short)floor(cv[0]);
m = (short)floor(cv[1]);
y = (short)floor(cv[2]);
421 replace TICToGpsTime(ctic,&g); with TICToGpsTime(ctic,&g,(int)7);
422 replace GpsTimeToUTCDate(&g,&t); with GpsTimeToUTCDate(&g,&t,(int)7);
432 replace UTCDateToGpsTime(&t,&g); with UTCDateToGpsTime(&t,&g,(int)7);
455 replace PROTECT++; with rec_mutex_lock ((int)7);
458 replace ValidateAlmanac(sv); with ValidateAlmanac(sv,(int)7);
459 replace ValidateEphemeris(sv); with ValidateEphemeris(sv,(int)7);
465 replace ExtrapolationUpdate(sv,EPHEMERIS); with ExtrapolationUpdate(sv,EPHEMERIS,(int)7);
467 replace ExtrapolationUpdate(sv,ALMANAC); with ExtrapolationUpdate(sv,ALMANAC,(int)7);
469 replace SVPredicts(sv); with SVPredicts(sv,(int)7);
473 replace PROTECT--; with rec_mutex_unlock ((int)7);
488 replace sscanf(cb,"SS %d %d",&sv,&chan); with sv = (unsigned short)floor(cv[0]);
chan = (unsigned short)floor(cv[1]);
492 replace disable(); with rtl_no_interrupts(state);
494 remove enable(); with rtl_restore_interrupts(state);
497 replace SVPredicts(sv);with SVPredicts(sv,(int)7);
515 replace sscanf(&cb[2],"%2d %2d %2d",&h,&m,&s); with h = (short)floor(cv[0]);
m = (short)floor(cv[1]);
s = (short)floor(cv[2]);
524 replace TICToGpsTime(ctic,&g); with TICToGpsTime(ctic,&g,(int)7);
525 replace GpsTimeToUTCDate(&g,&t); with GpsTimeToUTCDate(&g,&t,(int)7);
535 replace UTCDateToGpsTime(&t,&g); with UTCDateToGpsTime(&t,&g,(int)7);
557 replace PROTECT++; with rec_mutex_lock ((int)7);
561 replace ValidateAlmanac(sv); with ValidateAlmanac(sv,(int)7);
562 replace ValidateEphemeris(sv); with ValidateEphemeris(sv,(int)7);
568 replace ExtrapolationUpdate(sv,EPHEMERIS); with ExtrapolationUpdate(sv,EPHEMERIS,(int)7);
570 replace ExtrapolationUpdate(sv,ALMANAC); with ExtrapolationUpdate(sv,ALMANAC,(int)7);
572 replace SVPredicts(sv); with SVPredicts(sv,(int)7);
575 replace PROTECT--; with rec_mutex_unlock ((int)7);
588 replace sscanf(cb,"TM%d",&track_mode); with track_mode = (unsigned short)floor(cv[0]);
599 replace PROTECT++; with rec_mutex_lock ((int)7);
562 replace PROTECT--; with rec_mutex_unlock ((int)7);
617 insert /* ZZ/YY starts/stops sending data to linuxmon */
if (cc1=='Z' && cc2=='B'){
SendData = TRUE;
return;
}
if (cc1=='Z' && cc2=='E'){
SendData = FALSE;
return;
}
638 replace void CheckCommandBuffer(void) with int CheckCommandBuffer(unsigned fifo)
639 replace CheckCommandBuffer function contents with int err; typedef struct
{
char C_Buffer[3];
double cva[3];
} CBufferStruc;

CBufferStruc Comm_Buffer;

if ((err = rtf_get(0, &Comm_Buffer, sizeof(Comm_Buffer))) > 0) {
// rtl_printf("cv = %d\n",(int)floor(Comm_Buffer.cva[0]));
ProcessCommand(&Comm_Buffer.C_Buffer[0],&Comm_Buffer.cva[0]);
}
else {
rtl_printf("error reading command\n");
return -EINVAL;
}
return 0;
702 replace void LoadAlmanacs(void) with void LoadAlmanacs(double *cv)
704 replace LoadAlmanacs function contents with int sats=1;
int sentence_type;

do
{
sentence_type = (int)floor(cv[0]);

switch(sentence_type)
{
case 13:
Process_F13(sats);
break;

case 14:
Process_F14(sats);
break;
case 15:
Process_F15();
break;
}

} while(sats<=MAXSATELLITES*2 + 1); /* 32 alms + 32 ephems + iono. */
768 remove ExtractAlmanac(char *Buffer) function
823 insert almstrucl la;
824 remove sscanf(&Buffer[index],"%2d",&almanac);
almanac = almanac -1;
index += 2;

sscanf(&Buffer[index],"%1d",&vflg);
index += 1;

sscanf(&Buffer[index],"%3d",&almhlth);
index += 3;

sscanf(&Buffer[index],"%4d",&refweek);
index += 4;

sscanf(&Buffer[index],"%6lu",&toa);
index += 6;

sscanf(&Buffer[index],"%9lf",&ecc);
index += 9;
sscanf(&Buffer[index],"%9lf",&inclin);
index += 9;

sscanf(&Buffer[index],"%15lf",&rora);
index += 15;

sscanf(&Buffer[index],"%9lf",&sqrta);
index += 9;

sscanf(&Buffer[index],"%10lf",&ratoa);
index += 10;

sscanf(&Buffer[index],"%10lf",&argpg);
index += 10;

sscanf(&Buffer[index],"%10lf",&manom);
index += 10;

sscanf(&Buffer[index],"%10lf",&af0);
index += 10;

sscanf(&Buffer[index],"%15lf",&af1);
index += 15;
868 insert rtf_get(6,&la,sizeof(la));
913 remove sscanf(&Buffer[index],"%2d",&ephemeris);
ephemeris = ephemeris -1;
index += 2;

sscanf(&Buffer[index],"%1d",&vflg);
index += 1;

sscanf(&Buffer[index],"%6ld",&TofXmission);
index += 6;

sscanf(&Buffer[index],"%3d",&s1hlth);
index += 3;

sscanf(&Buffer[index],"%1d",&codeL2);
index += 1;

sscanf(&Buffer[index],"%4d",&wkn);
index += 4;

sscanf(&Buffer[index],"%1d",&L2Pdata);
index += 1;

sscanf(&Buffer[index],"%2d",&ura);
index += 2;

sscanf(&Buffer[index],"%4d",&iodc);
index += 4;

sscanf(&Buffer[index],"%13lf",&tgd);
index += 13;

sscanf(&Buffer[index],"%4d",&tocwk);
index += 4;

sscanf(&Buffer[index],"%6lf",&toc);
index += 6;

sscanf(&Buffer[index],"%13lf",&af0);
index += 13;

sscanf(&Buffer[index],"%16lf",&af1);
index += 16;

sscanf(&Buffer[index],"%20lf",&af2);
index += 20;

sscanf(&Buffer[index],"%3d",&iode);
index += 3;

sscanf(&Buffer[index],"%8lf",&crs);
index += 8;

sscanf(&Buffer[index],"%16lf",&deltan);
index += 16;

sscanf(&Buffer[index],"%13lf",&m0);
index += 13;

sscanf(&Buffer[index],"%12lf",&cuc);
index += 12;

sscanf(&Buffer[index],"%12lf",&ecc);
index += 12;

sscanf(&Buffer[index],"%12lf",&cus);
index += 12;

sscanf(&Buffer[index],"%11lf",&sqrta);
index += 11;

sscanf(&Buffer[index],"%4d",&toewk);
index += 4;

sscanf(&Buffer[index],"%6lf",&toe);
index += 6;

sscanf(&Buffer[index],"%1d",&fti);
index += 1;

sscanf(&Buffer[index],"%12lf",&cic);
index += 12;

sscanf(&Buffer[index],"%13lf",&om0);
index += 13;

sscanf(&Buffer[index],"%12lf",&cis);
index += 12;

sscanf(&Buffer[index],"%13lf",&in0);
index += 13;

sscanf(&Buffer[index],"%8lf",&crc);
index += 8;

sscanf(&Buffer[index],"%13lf",&olc);
index += 13;

sscanf(&Buffer[index],"%16lf",&omd);
index += 16;

sscanf(&Buffer[index],"%16lf",&idot);
index += 16;
1017 insert rtf_get(6,&le,sizeof(le));
1081 remove sscanf(&Buffer[index],"%1d",&vflg);
index += 1;

sscanf(&Buffer[index],"%13lf",&a0);
index += 13;

sscanf(&Buffer[index],"%12lf",&a1);
index += 12;

sscanf(&Buffer[index],"%11lf",&a2);
index += 11;

sscanf(&Buffer[index],"%11lf",&a3);
index += 11;

sscanf(&Buffer[index],"%7lf",&b0);
index += 7;

sscanf(&Buffer[index],"%8lf",&b1);
index += 8;

sscanf(&Buffer[index],"%9lf",&b2);
index += 9;

sscanf(&Buffer[index],"%9lf",&b3);
index += 9;

sscanf(&Buffer[index],"%13lf",&A0);
index += 13;

sscanf(&Buffer[index],"%19lf",&A1);
index += 19;

sscanf(&Buffer[index],"%7lu",&tot);
index += 7;

sscanf(&Buffer[index],"%4d",&dtls);
index += 4;

sscanf(&Buffer[index],"%3u",&wnt);
index += 3;

sscanf(&Buffer[index],"%3u",&wnlsf);
index += 3;

sscanf(&Buffer[index],"%3d",&dn);
index += 3;

sscanf(&Buffer[index],"%4d",&dtlsf);
index += 4;
1169 insert read(fd_fifo[6],&liu,sizeof(liu));
1170 insert ionoutc = liu;