[Hamlib-cvs-digest] CVS: hamlib/icom frame.c,1.4,1.5 frame.h,1.2,1.3

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

Update of /cvsroot/hamlib/hamlib/icom
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10301

Modified Files:
	frame.c frame.h 
Log Message:
* some cleanup (removed deprecated make_cmd_frame_freq and make_cmd_frame_chan)

Index: frame.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** frame.c	2000/10/16 22:30:32	1.4
--- frame.c	2000/11/01 23:21:47	1.5
***************
*** 86,137 ****
  }
  
- int make_cmd_frame_freq(char frame[], char re_id, char cmd, int subcmd, freq_t freq, int ic731_mode)
- {
- 	int freq_len;
- 	int i = 0;
- 
- 	frame[i++] = PAD;	/* give old rigs a chance to flush their rx buffers */
- 	frame[i++] = PR;	/* Preamble code */
- 	frame[i++] = PR;
- 	frame[i++] = re_id;
- 	frame[i++] = CTRLID;
- 	frame[i++] = cmd;
- 	if (subcmd != -1)
- 			frame[i++] = subcmd & 0xff;
- 
- 	freq_len = ic731_mode ? 4:5;
- 	to_bcd(frame+i, freq, freq_len*2);	/* to_bcd requires nibble len */
- 
- 	i += freq_len;
- 	frame[i++] = FI;		/* EOM code */
- 
- 	return i;
- }
- 
- /*
-  * for C_SET_MEM, subcmd=-1
-  */
- int 
- make_cmd_frame_chan(char frame[], char re_id, char cmd, int subcmd, int chan)
- {
- 	int i = 0;
- 
- 	frame[i++] = PAD;	/* give old rigs a chance to flush their rx buffers */
- 	frame[i++] = PR;	/* Preamble code */
- 	frame[i++] = PR;
- 	frame[i++] = re_id;
- 	frame[i++] = CTRLID;
- 	frame[i++] = cmd;
- 	if (subcmd != -1)
- 			frame[i++] = subcmd & 0xff;
- 
- 	to_bcd(frame+i, (freq_t)chan, 4);	/* to_bcd requires nibble len */
- 
- 	i += 2;		/* channel number is on 4 digits = 2 octets */
- 	frame[i++] = FI;		/* EOM code */
- 
- 	return i;
- }
- 
  /*
   * icom_transaction
--- 86,89 ----
***************
*** 217,221 ****
   * read_icom_frame
   * read a whole CI-V frame (until 0xfd is encountered)
!  * TODO: strips pading/collisions
   * FIXME: check return codes/bytes read
   */
--- 169,173 ----
   * read_icom_frame
   * read a whole CI-V frame (until 0xfd is encountered)
!  * TODO: strips padding/collisions
   * FIXME: check return codes/bytes read
   */
***************
*** 292,295 ****
--- 244,248 ----
  		case S_LSB:	mode = RIG_MODE_LSB; break;
  		case S_RTTY:	mode = RIG_MODE_RTTY; break;
+ 		case 0xff:	mode = 0; break;	/* blank mem channel */
  
  		default:

Index: frame.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** frame.h	2000/10/08 21:35:48	1.2
--- frame.h	2000/11/01 23:21:47	1.3
***************
*** 36,42 ****
  int make_cmd_frame(char frame[], char re_id, char cmd, int subcmd, const char *data, int data_len);
  
- int make_cmd_frame_freq(char frame[], char re_id, char cmd, int subcmd, freq_t freq, int ic731_mode);
- int make_cmd_frame_chan(char frame[], char re_id,char cmd,int subcmd,int chan);
- 
  int icom_transaction (RIG *rig, int cmd, int subcmd, const char *payload, int payload_len, char *data, int *data_len);
  int read_icom_frame(FILE *stream, unsigned char rxbuffer[], int timeout);
--- 36,39 ----