[Hamlib-cvs-digest] CVS: hamlib/pcr pcr.c,1.14,1.15

[Stephane F. <fi...@us...>]

Update of /cvsroot/hamlib/hamlib/pcr
In directory usw-pr-cvs1:/tmp/cvs-serv25244

Modified Files:
	pcr.c 
Log Message:
temporary fix: read_block instead of read_string to make initialization to work, added UK code info

Index: pcr.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/pcr/pcr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** pcr.c	13 Mar 2002 23:56:41 -0000	1.14
--- pcr.c	26 Mar 2002 08:05:51 -0000	1.15
***************
*** 65,68 ****
--- 65,69 ----
  #define COUNTRY_JAPAN	0x08
  #define	COUNTRY_USA		0x01
+ #define	COUNTRY_UK		0x02	/* TBC */
  #define	COUNTRY_EUAUCA	0x0a
  #define	COUNTRY_FGA		0x0b
***************
*** 106,109 ****
--- 107,111 ----
  
  	/* eat the first ack */
+ #ifdef WANT_READ_STRING
  	retval = read_string(&rs->rigport, data, 1, "\x0a", 1);
  	if (retval < 0)
***************
*** 111,117 ****
--- 113,126 ----
  	if (retval != 1)
  			return -RIG_EPROTO;
+ #else
+ 	retval = read_block(&rs->rigport, data, 1);
+ #endif
  
  	/* here is the real response */
+ #ifdef WANT_READ_STRING
  	*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;
***************
*** 461,464 ****
--- 470,474 ----
  		case COUNTRY_JAPAN: country = "Japan"; break;
  		case COUNTRY_USA: country = "USA"; break;
+ 		case COUNTRY_UK: country = "UK"; break;
  		case COUNTRY_EUAUCA: country = "Europe/Australia/Canada"; break;
  		case COUNTRY_FGA: country = "FGA?"; break;
***************
*** 473,477 ****
  
  		sprintf(buf, "Firmware v%d.%d, Protocol v%d.%d, "
! 						"Optional devices:%s%s%s, Country: %s, ", 
  						frmwr_version/10,frmwr_version%10,
  						proto_version/10,proto_version%10,
--- 483,487 ----
  
  		sprintf(buf, "Firmware v%d.%d, Protocol v%d.%d, "
! 						"Optional devices:%s%s%s, Country: %s", 
  						frmwr_version/10,frmwr_version%10,
  						proto_version/10,proto_version%10,