From 9902d8ed6dffb7d0cbb08d72b0b32e2fe5cbe391 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Sun, 21 Aug 2011 18:29:28 -0500 Subject: [PATCH] Update LGPL/GPL header in RPC rig source files. TNX to Lucian Laga, YO6PLB, for the notification. --- rpcrig/rpcrig.x | 19 +++++++++---------- rpcrig/rpcrig_backend.c | 39 +++++++++++++++++++-------------------- rpcrig/rpcrig_backend.h | 19 +++++++++---------- rpcrig/rpcrig_proc.c | 29 ++++++++++++++--------------- rpcrig/rpcrigd.c | 36 +++++++++++++++++------------------- 5 files changed, 68 insertions(+), 74 deletions(-) diff --git a/rpcrig/rpcrig.x b/rpcrig/rpcrig.x index 448829517..332f2e8cc 100644 --- a/rpcrig/rpcrig.x +++ b/rpcrig/rpcrig.x @@ -2,21 +2,20 @@ % * Hamlib Interface - RPC definitions % * Copyright (c) 2000-2002 by Stephane Fillod and Frank Singleton % * -% * $Id: rpcrig.x,v 1.11 2006-01-09 21:41:39 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 -% * published by the Free Software Foundation; either version 2 of -% * the License, or (at your option) any later version. +% * This library is free software; you can redistribute it and/or +% * modify it under the terms of the GNU Lesser General Public +% * License as published by the Free Software Foundation; either +% * version 2.1 of the License, or (at your option) any later version. % * -% * This program is distributed in the hope that it will be useful, +% * This library is distributed in the hope that it will be useful, % * but WITHOUT ANY WARRANTY; without even the implied warranty of -% * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% * GNU Library General Public License for more details. +% * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +% * Lesser General Public License for more details. % * -% * You should have received a copy of the GNU Library General Public +% * You should have received a copy of the GNU Lesser General Public % * License along with this library; if not, write to the Free Software -% * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +% * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA % * % */ diff --git a/rpcrig/rpcrig_backend.c b/rpcrig/rpcrig_backend.c index 863241712..3369a0486 100644 --- a/rpcrig/rpcrig_backend.c +++ b/rpcrig/rpcrig_backend.c @@ -2,21 +2,20 @@ * Hamlib RPC backend - main file * Copyright (c) 2001-2008 by Stephane Fillod * - * $Id: rpcrig_backend.c,v 1.20 2008-10-31 22:14:10 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 - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -155,7 +154,7 @@ static int rpcrig_init(RIG *rig) struct rpcrig_priv_data *priv; if (!rig || !rig->caps) return -RIG_EINVAL; - + rig->state.priv = malloc(sizeof(struct rpcrig_priv_data)); if (!rig->state.priv) { /* whoops! memory shortage! */ @@ -243,7 +242,7 @@ static int rpcrig_open(RIG *rig) * This for example breaks reentrancy */ //memcpy(&rpcrig_caps, caps, sizeof(struct rig_caps)); - + /* * TODO: get these from RPC instead */ @@ -269,20 +268,20 @@ static int rpcrig_open(RIG *rig) rs->max_ifshift = rs_res->rigstate_res_u.state.max_ifshift; rs->announces = rs_res->rigstate_res_u.state.announces; - memcpy(rs->preamp, rs_res->rigstate_res_u.state.preamp, + memcpy(rs->preamp, rs_res->rigstate_res_u.state.preamp, sizeof(int)*MAXDBLSTSIZ); - memcpy(rs->attenuator, rs_res->rigstate_res_u.state.attenuator, + memcpy(rs->attenuator, rs_res->rigstate_res_u.state.attenuator, sizeof(int)*MAXDBLSTSIZ); - memcpy(rs->tuning_steps, rs_res->rigstate_res_u.state.tuning_steps, + memcpy(rs->tuning_steps, rs_res->rigstate_res_u.state.tuning_steps, sizeof(struct tuning_step_list)*TSLSTSIZ); - memcpy(rs->filters, rs_res->rigstate_res_u.state.filters, + memcpy(rs->filters, rs_res->rigstate_res_u.state.filters, sizeof(struct filter_list)*FLTLSTSIZ); - memcpy(rs->chan_list, rs_res->rigstate_res_u.state.chan_list, + memcpy(rs->chan_list, rs_res->rigstate_res_u.state.chan_list, sizeof(chan_t)*CHANLSTSIZ); - memcpy(rs->rx_range_list, rs_res->rigstate_res_u.state.rx_range_list, + memcpy(rs->rx_range_list, rs_res->rigstate_res_u.state.rx_range_list, sizeof(freq_range_t)*FRQRANGESIZ); - memcpy(rs->tx_range_list, rs_res->rigstate_res_u.state.tx_range_list, + memcpy(rs->tx_range_list, rs_res->rigstate_res_u.state.tx_range_list, sizeof(freq_range_t)*FRQRANGESIZ); for (i=0; irx_range_list[i]); i++) { @@ -1046,7 +1045,7 @@ struct rig_caps rpcrig_caps = { .get_mode = rpcrig_get_mode, .set_vfo = rpcrig_set_vfo, .get_vfo = rpcrig_get_vfo, - + .set_powerstat = rpcrig_set_powerstat, .get_powerstat = rpcrig_get_powerstat, .set_level = rpcrig_set_level, diff --git a/rpcrig/rpcrig_backend.h b/rpcrig/rpcrig_backend.h index dc79683e7..76eaf2f3f 100644 --- a/rpcrig/rpcrig_backend.h +++ b/rpcrig/rpcrig_backend.h @@ -2,21 +2,20 @@ * Hamlib RPC backend - main header * Copyright (c) 2001-2003 by Stephane Fillod * - * $Id: rpcrig_backend.h,v 1.5 2003-04-16 22:30:42 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 - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff --git a/rpcrig/rpcrig_proc.c b/rpcrig/rpcrig_proc.c index 3c0e6097f..eef50a437 100644 --- a/rpcrig/rpcrig_proc.c +++ b/rpcrig/rpcrig_proc.c @@ -2,21 +2,20 @@ * Hamlib RPC server - procedures * Copyright (c) 2001-2003 by Stephane Fillod * - * $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 - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -133,13 +132,13 @@ rigstate_res *getrigstate_1_svc(void *arg, struct svc_req *svc) memcpy(res.rigstate_res_u.state.tuning_steps, rs->tuning_steps, sizeof(tuning_step_s)*TSLSTSIZ); - memcpy(res.rigstate_res_u.state.filters, rs->filters, + memcpy(res.rigstate_res_u.state.filters, rs->filters, sizeof(filter_s)*FLTLSTSIZ); - memcpy(res.rigstate_res_u.state.chan_list, rs->chan_list, + memcpy(res.rigstate_res_u.state.chan_list, rs->chan_list, sizeof(chan_s)*CHANLSTSIZ); - memcpy(res.rigstate_res_u.state.rx_range_list, rs->rx_range_list, + memcpy(res.rigstate_res_u.state.rx_range_list, rs->rx_range_list, sizeof(freq_range_s)*FRQRANGESIZ); - memcpy(res.rigstate_res_u.state.tx_range_list, rs->tx_range_list, + memcpy(res.rigstate_res_u.state.tx_range_list, rs->tx_range_list, sizeof(freq_range_s)*FRQRANGESIZ); res.rigstatus = RIG_OK; @@ -372,7 +371,7 @@ val_res *getfunc_1_svc(setting_arg *arg, struct svc_req *svc) setting = setting_x2t(&arg->setting); val.i = arg->val.i; - res.rigstatus = rig_get_func(the_rpc_rig, arg->vfo, setting, + res.rigstatus = rig_get_func(the_rpc_rig, arg->vfo, setting, &res.val_res_u.val.i); return &res; diff --git a/rpcrig/rpcrigd.c b/rpcrig/rpcrigd.c index 9876fab05..6425453f5 100644 --- a/rpcrig/rpcrigd.c +++ b/rpcrig/rpcrigd.c @@ -4,23 +4,21 @@ * This program let programs control a radio through * the mean of RPC services using Hamlib. * - * $Id: rpcrigd.c,v 1.7 2003-08-17 22:39:07 fillods Exp $ * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #ifdef HAVE_CONFIG_H @@ -47,7 +45,7 @@ -/* +/* * Prototypes */ void usage(); @@ -58,7 +56,7 @@ void rigprog_1(struct svc_req *rqstp, register SVCXPRT *transp); /* - * Reminder: when adding long options, + * Reminder: when adding long options, * keep up to date SHORT_OPTIONS, usage()'s output and man page. thanks. * NB: do NOT use -W since it's reserved by POSIX. */ @@ -276,7 +274,7 @@ main (int argc, char *argv[]) the_rpc_rig = rig_init(my_model); if (!the_rpc_rig) { - fprintf(stderr, "Unknown rig num %d, or initialization error.\n", + fprintf(stderr, "Unknown rig num %d, or initialization error.\n", my_model); fprintf(stderr, "Please check with rigctl --list option.\n"); exit(2); @@ -291,7 +289,7 @@ main (int argc, char *argv[]) if (rig_file) strncpy(the_rpc_rig->state.rigport.pathname, rig_file, FILPATHLEN); - /* + /* * ex: RIG_PTT_PARALLEL and /dev/parport0 */ if (ptt_type != RIG_PTT_NONE)