shadowed struct declaration fixup

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1449 7ae35d74-ebe9-4afe-98af-79ac388436b8

rpcrig/rpcrig.x

@@ -2,7 +2,7 @@
 % *  Hamlib Interface - RPC definitions
 % *  Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton
 % *
-% *	$Id: rpcrig.x,v 1.6 2003-04-06 18:40:35 fillods Exp $
+% *	$Id: rpcrig.x,v 1.7 2003-04-22 19:31:46 fillods Exp $
 % *
 % *   This library is free software; you can redistribute it and/or modify
 % *   it under the terms of the GNU Library General Public License as
@@ -241,10 +241,16 @@ struct filter_s {
 	rmode_x modes;
 	pbwidth_x width;
 };
+struct channel_cap_x {
+	unsigned int caps;
+	setting_x funcs;
+	setting_x levels;
+};
 struct chan_s {
 	int start;
 	int end;
 	unsigned int type;
+	channel_cap_x mem_caps;
 };
 
 struct rigstate_s {

rpcrig/rpcrig_backend.c

@@ -2,7 +2,7 @@
  *  Hamlib RPC backend - main file
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: rpcrig_backend.c,v 1.14 2003-04-16 22:30:42 fillods Exp $
+ *	$Id: rpcrig_backend.c,v 1.15 2003-04-22 19:31:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -1004,7 +1004,7 @@ struct rig_caps rpcrig_caps = {
   .rig_model =      RIG_MODEL_RPC,
   .model_name =     "RPC rig",
   .mfg_name =       "Hamlib",
-  .version =        "0.2",
+  .version =        "0.3",
   .copyright = 	 "LGPL",
   .status =         RIG_STATUS_ALPHA,
   .rig_type =       RIG_TYPE_OTHER,

rpcrig/rpcrig_proc.c

@@ -2,7 +2,7 @@
  *  Hamlib RPC server - procedures
  *  Copyright (c) 2001-2003 by Stephane Fillod
  *
- *	$Id: rpcrig_proc.c,v 1.7 2003-04-06 18:40:35 fillods Exp $
+ *	$Id: rpcrig_proc.c,v 1.8 2003-04-22 19:31:47 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -132,15 +132,15 @@ rigstate_res *getrigstate_1_svc(void *arg, struct svc_req *svc)
 					sizeof(int)*MAXDBLSTSIZ);
 
 	memcpy(res.rigstate_res_u.state.tuning_steps, rs->tuning_steps,
-					sizeof(struct tuning_step_list)*TSLSTSIZ);
+					sizeof(tuning_step_s)*TSLSTSIZ);
 	memcpy(res.rigstate_res_u.state.filters, rs->filters, 
-					sizeof(struct filter_list)*FLTLSTSIZ);
+					sizeof(filter_s)*FLTLSTSIZ);
 	memcpy(res.rigstate_res_u.state.chan_list, rs->chan_list, 
-					sizeof(chan_t)*CHANLSTSIZ);
+					sizeof(chan_s)*CHANLSTSIZ);
 	memcpy(res.rigstate_res_u.state.rx_range_list, rs->rx_range_list, 
-					sizeof(freq_range_t)*FRQRANGESIZ);
+					sizeof(freq_range_s)*FRQRANGESIZ);
 	memcpy(res.rigstate_res_u.state.tx_range_list, rs->tx_range_list, 
-					sizeof(freq_range_t)*FRQRANGESIZ);
+					sizeof(freq_range_s)*FRQRANGESIZ);
 
 	res.rigstatus = RIG_OK;