mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

temporary fix: read_block instead of read_string to make initialization to work, added UK code info 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1036 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.3
Stéphane Fillod, F8CFE 2002-03-26 08:05:51 +00:00
rodzic 954617c1bd
commit a0cae89171
1 zmienionych plików z 12 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
pcr/pcr.c
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib PCR backend - main file * Hamlib PCR backend - main file
* Copyright (c) 2001-2002 by Stephane Fillod * Copyright (c) 2001-2002 by Stephane Fillod
* *
* $Id: pcr.c,v 1.14 2002-03-13 23:56:41 fillods Exp $ * $Id: pcr.c,v 1.15 2002-03-26 08:05:51 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -64,6 +64,7 @@
/* as returned by GE? */ /* as returned by GE? */
#define COUNTRY_JAPAN 0x08 #define COUNTRY_JAPAN 0x08
#define COUNTRY_USA 0x01 #define COUNTRY_USA 0x01
#define COUNTRY_UK 0x02 /* TBC */
#define COUNTRY_EUAUCA 0x0a #define COUNTRY_EUAUCA 0x0a
#define COUNTRY_FGA 0x0b #define COUNTRY_FGA 0x0b
#define COUNTRY_DEN 0x0c #define COUNTRY_DEN 0x0c
@ -105,14 +106,22 @@ int pcr_transaction(RIG *rig, const char *cmd, int cmd_len, char *data, int *dat
return retval; return retval;
/* eat the first ack */ /* eat the first ack */
#ifdef WANT_READ_STRING
retval = read_string(&rs->rigport, data, 1, "\x0a", 1); retval = read_string(&rs->rigport, data, 1, "\x0a", 1);
if (retval < 0) if (retval < 0)
return retval; return retval;
if (retval != 1) if (retval != 1)
return -RIG_EPROTO; return -RIG_EPROTO;
#else
retval = read_block(&rs->rigport, data, 1);
#endif
/* here is the real response */ /* here is the real response */
#ifdef WANT_READ_STRING
*data_len = read_string(&rs->rigport, data, *data_len, "\x0a", 1); *data_len = read_string(&rs->rigport, data, *data_len, "\x0a", 1);
#else
*data_len = read_block( &rs->rigport, data, *data_len );
#endif
return RIG_OK; return RIG_OK;
} }
@ -460,6 +469,7 @@ const char *pcr_get_info(RIG *rig)
switch (country_code) { switch (country_code) {
case COUNTRY_JAPAN: country = "Japan"; break; case COUNTRY_JAPAN: country = "Japan"; break;
case COUNTRY_USA: country = "USA"; break; case COUNTRY_USA: country = "USA"; break;
case COUNTRY_UK: country = "UK"; break;
case COUNTRY_EUAUCA: country = "Europe/Australia/Canada"; break; case COUNTRY_EUAUCA: country = "Europe/Australia/Canada"; break;
case COUNTRY_FGA: country = "FGA?"; break; case COUNTRY_FGA: country = "FGA?"; break;
case COUNTRY_DEN: country = "DEN?"; break; case COUNTRY_DEN: country = "DEN?"; break;
@ -472,7 +482,7 @@ const char *pcr_get_info(RIG *rig)
sprintf(buf, "Firmware v%d.%d, Protocol v%d.%d, " sprintf(buf, "Firmware v%d.%d, Protocol v%d.%d, "
"Optional devices:%s%s%s, Country: %s, ", "Optional devices:%s%s%s, Country: %s",
frmwr_version/10,frmwr_version%10, frmwr_version/10,frmwr_version%10,
proto_version/10,proto_version%10, proto_version/10,proto_version%10,
options&OPT_UT106 ? " DSP" : "", options&OPT_UT106 ? " DSP" : "",