Menu
▾
▴
[Hamlib-cvs-digest] CVS: hamlib/kenwood th.c,1.25,1.26 thg71.c,1.14,1.15 tmv7.c,1.7,1.8
|
From: <fi...@us...> - 2005-01-24 23:05:50
|
Update of /cvsroot/hamlib/hamlib/kenwood In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4671/kenwood Modified Files: th.c thg71.c tmv7.c Log Message: * abstract 64bit int format type to cope with portability issues. introduce PRIll (printf format) and SCNll (scanf) in misc.h. This needs to have config.h included beforehand. * do likewise with freq_t type (double) in rig.h FREQFMT is deprecated. Index: th.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/th.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** th.c 28 Dec 2004 12:58:51 -0000 1.25 --- th.c 24 Jan 2005 23:04:03 -0000 1.26 *************** *** 1,5 **** /* * Hamlib Kenwood backend - TH handheld primitives ! * Copyright (c) 2001-2003 by Stephane Fillod * * $Id$ --- 1,5 ---- /* * Hamlib Kenwood backend - TH handheld primitives ! * Copyright (c) 2001-2005 by Stephane Fillod * * $Id$ *************** *** 82,86 **** int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF %d,%"FREQFMT",%d,%d,%d,%d,%d,,%d,,%d,%"FREQFMT",%d", &vfo, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset, &mode); --- 82,86 ---- int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF %d,%"SCNfreq",%d,%d,%d,%d,%d,,%d,,%d,%"SCNfreq",%d", &vfo, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset, &mode); *************** *** 1163,1167 **** strcpy(scf,req); ! strcat(scf,",%"FREQFMT",%d,%d,%d,%d,%d,,%d,,%d,%"FREQFMT); retval = sscanf(ackbuf, scf, &freq, &step, &shift, &rev, &tone, --- 1163,1167 ---- strcpy(scf,req); ! strcat(scf,",%"SCNfreq",%d,%d,%d,%d,%d,,%d,,%d,%"SCNfreq); retval = sscanf(ackbuf, scf, &freq, &step, &shift, &rev, &tone, *************** *** 1208,1212 **** if (retval == RIG_OK) { strcpy(scf,req); ! strcat(scf,",%"FREQFMT",%d"); retval = sscanf(ackbuf, scf, &freq, &step); chan->tx_freq=freq; --- 1208,1212 ---- if (retval == RIG_OK) { strcpy(scf,req); ! strcat(scf,",%"SCNfreq",%d"); retval = sscanf(ackbuf, scf, &freq, &step); chan->tx_freq=freq; Index: thg71.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/thg71.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** thg71.c 6 Dec 2004 22:16:55 -0000 1.14 --- thg71.c 24 Jan 2005 23:04:16 -0000 1.15 *************** *** 1,5 **** /* * Hamlib Kenwood backend - TH-G71 description ! * Copyright (c) 2003-2004 by Stephane Fillod * * $Id$ --- 1,5 ---- /* * Hamlib Kenwood backend - TH-G71 description ! * Copyright (c) 2003-2005 by Stephane Fillod * * $Id$ *************** *** 200,204 **** int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF 0,%"FREQFMT",%d,%d,%d,%d,%d,,%d,,%d,%"FREQFMT, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset); --- 200,204 ---- int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF 0,%"SCNfreq",%d,%d,%d,%d,%d,,%d,,%d,%"SCNfreq, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset); *************** *** 208,212 **** } ! rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"FREQFMT" Hz, mode %d)\n", __FUNCTION__, freq); /* Callback execution */ --- 208,212 ---- } ! rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz, mode %d)\n", __FUNCTION__, freq); /* Callback execution */ *************** *** 312,316 **** return retval; ! sscanf(ackbuf,"FQ %"FREQFMT",%d",&freq,&step); if(freq <MHz(136) ) { --- 312,316 ---- return retval; ! sscanf(ackbuf,"FQ %"SCNfreq",%d",&freq,&step); if(freq <MHz(136) ) { Index: tmv7.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/kenwood/tmv7.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** tmv7.c 28 Dec 2004 12:59:41 -0000 1.7 --- tmv7.c 24 Jan 2005 23:04:16 -0000 1.8 *************** *** 1,5 **** /* * Hamlib Kenwood backend - TM-V7 description ! * Copyright (c) 2004 by Stephane Fillod * * $Id$ --- 1,5 ---- /* * Hamlib Kenwood backend - TM-V7 description ! * Copyright (c) 2004-2005 by Stephane Fillod * * $Id$ *************** *** 230,234 **** int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF 0,%"FREQFMT",%d,%d,%d,%d,%d,,%d,,%d,%"FREQFMT, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset); --- 230,234 ---- int step, shift, rev, tone, ctcss, tonefq, ctcssfq; ! retval = sscanf(asyncbuf, "BUF 0,%"SCNfreq",%d,%d,%d,%d,%d,,%d,,%d,%"SCNfreq, &freq, &step, &shift, &rev, &tone, &ctcss, &tonefq, &ctcssfq, &offset); *************** *** 238,242 **** } ! rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"FREQFMT" Hz, mode %d)\n", __FUNCTION__, freq); /* Callback execution */ --- 238,242 ---- } ! rig_debug(RIG_DEBUG_TRACE, "%s: Buffer (freq %"PRIfreq" Hz, mode %d)\n", __FUNCTION__, freq); /* Callback execution */ *************** *** 402,406 **** return retval; ! sscanf(ackbuf,"FQ %"FREQFMT",%d",&freq,&step); if(freq <MHz(137) ) { --- 402,406 ---- return retval; ! sscanf(ackbuf,"FQ %"SCNfreq",%d",&freq,&step); if(freq <MHz(137) ) { *************** *** 474,478 **** strcpy(scf,req); ! strcat(scf,",%"FREQFMT",%d,%d,%d,%d,0,%d,%d,000,%d,,0"); retval = sscanf(ackbuf, scf, &freq, &step, &shift, &rev, &tone, --- 474,478 ---- strcpy(scf,req); ! strcat(scf,",%"SCNfreq",%d,%d,%d,%d,0,%d,%d,000,%d,,0"); retval = sscanf(ackbuf, scf, &freq, &step, &shift, &rev, &tone, *************** *** 516,520 **** if (retval == RIG_OK) { strcpy(scf,req); ! strcat(scf,",%"FREQFMT",%d"); retval = sscanf(ackbuf, scf, &freq, &step); chan->tx_freq=freq; --- 516,520 ---- if (retval == RIG_OK) { strcpy(scf,req); ! strcat(scf,",%"SCNfreq",%d"); retval = sscanf(ackbuf, scf, &freq, &step); chan->tx_freq=freq; |