diff --git a/kenwood/kenwood.c b/kenwood/kenwood.c index 40ea6ecbd..cbff4eefe 100644 --- a/kenwood/kenwood.c +++ b/kenwood/kenwood.c @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - main file * Copyright (c) 2000-2004 by Stephane Fillod and others * - * $Id: kenwood.c,v 1.76 2004-05-02 17:17:31 fillods Exp $ + * $Id: kenwood.c,v 1.77 2004-06-13 12:35:30 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 @@ -1409,58 +1409,6 @@ DECLARE_PROBERIG_BACKEND(kenwood) } -/* kenwood_init - * - * Basically, it sets up *priv - * REM: serial port is already open (rig->state.rigport.fd) - */ -int kenwood_init(RIG *rig) -{ - const struct rig_caps *caps; - const struct kenwood_priv_caps *priv_caps; - rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); - - if (!rig || !rig->caps) - return -RIG_EINVAL; - - caps = rig->caps; - if (!caps->priv) - return -RIG_ECONF; - - priv_caps = (const struct kenwood_priv_caps *) caps->priv; - -#if 0 /* No private data for Kenwood backends */ - priv = (struct kenwood_priv_data *)malloc(sizeof(struct kenwood_priv_data)); - if (!priv) { - /* whoops! memory shortage! */ - return -RIG_ENOMEM; - } - - rig->state.priv = (void *)priv; - /* Assign default values */ - priv->dummy = -1; // placeholder for real entries. -#endif - - return RIG_OK; -} - -/* kenwood_cleanup - * the serial port is closed by the frontend - */ -int kenwood_cleanup(RIG *rig) -{ - rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __FUNCTION__); - - if (!rig) - return -RIG_EINVAL; - - if (rig->state.priv) - free(rig->state.priv); - rig->state.priv = NULL; - - return RIG_OK; -} - /* * initrigs_kenwood is called by rig_backend_load */ diff --git a/kenwood/thd7.c b/kenwood/thd7.c index 817b64014..626b5a79e 100644 --- a/kenwood/thd7.c +++ b/kenwood/thd7.c @@ -1,8 +1,8 @@ /* * Hamlib Kenwood backend - TH-D7 description - * Copyright (c) 2000-2003 by Stephane Fillod + * Copyright (c) 2000-2004 by Stephane Fillod * - * $Id: thd7.c,v 1.12 2004-03-21 18:25:54 f4dwv Exp $ + * $Id: thd7.c,v 1.13 2004-06-13 12:35:30 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 @@ -159,10 +159,6 @@ const struct rig_caps thd7a_caps = { RIG_FLT_END, }, .priv = (void *)&thd7_priv_caps, -.rig_init = kenwood_init, -.rig_cleanup = kenwood_cleanup, -.rig_open = NULL, -.rig_close = NULL, .set_freq = th_set_freq, .get_freq = th_get_freq, diff --git a/kenwood/thf7.c b/kenwood/thf7.c index d879837c7..15e3c45b0 100644 --- a/kenwood/thf7.c +++ b/kenwood/thf7.c @@ -1,8 +1,8 @@ /* * Hamlib Kenwood backend - TH-F7 description - * Copyright (c) 2001-2003 by Stephane Fillod + * Copyright (c) 2001-2004 by Stephane Fillod * - * $Id: thf7.c,v 1.10 2004-03-21 18:25:54 f4dwv Exp $ + * $Id: thf7.c,v 1.11 2004-06-13 12:35:30 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 @@ -137,10 +137,6 @@ const struct rig_caps thf7e_caps = { RIG_FLT_END, }, .priv = (void *)&thf7_priv_caps, -.rig_init = kenwood_init, -.rig_cleanup = kenwood_cleanup, -.rig_open = NULL, -.rig_close = NULL, .set_freq = th_set_freq, .get_freq = th_get_freq, diff --git a/kenwood/thg71.c b/kenwood/thg71.c index 37e044fa4..6c6ffbe2e 100644 --- a/kenwood/thg71.c +++ b/kenwood/thg71.c @@ -1,8 +1,8 @@ /* * Hamlib Kenwood backend - TH-G71 description - * Copyright (c) 2003 by Stephane Fillod + * Copyright (c) 2003-2004 by Stephane Fillod * - * $Id: thg71.c,v 1.12 2004-03-21 18:25:54 f4dwv Exp $ + * $Id: thg71.c,v 1.13 2004-06-13 12:35:30 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 @@ -155,8 +155,6 @@ const struct rig_caps thg71_caps = { .str_cal ={ 2, { {0, -30 }, {5,-13}}}, /* guessed from technical manual */ .priv = (void *)&thg71_priv_caps, -.rig_init = kenwood_init, -.rig_cleanup = kenwood_cleanup, .rig_open = thg71_open, .rig_close = NULL, diff --git a/kenwood/tmd700.c b/kenwood/tmd700.c index 2900fad7d..bec8fd5bd 100644 --- a/kenwood/tmd700.c +++ b/kenwood/tmd700.c @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - TM-D700 description * Copyright (c) 2000-2004 by Stephane Fillod * - * $Id: tmd700.c,v 1.3 2004-03-21 18:25:54 f4dwv Exp $ + * $Id: tmd700.c,v 1.4 2004-06-13 12:35:30 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 @@ -173,10 +173,6 @@ const struct rig_caps tmd700_caps = { RIG_FLT_END, }, .priv = (void *)&tmd700_priv_caps, -.rig_init = kenwood_init, -.rig_cleanup = kenwood_cleanup, -.rig_open = NULL, -.rig_close = NULL, .set_freq = th_set_freq, .get_freq = th_get_freq, diff --git a/kenwood/tmv7.c b/kenwood/tmv7.c index 72c23eedc..596415562 100644 --- a/kenwood/tmv7.c +++ b/kenwood/tmv7.c @@ -2,7 +2,7 @@ * Hamlib Kenwood backend - TM-V7 description * Copyright (c) 2004 by Stephane Fillod * - * $Id: tmv7.c,v 1.3 2004-03-21 18:26:46 f4dwv Exp $ + * $Id: tmv7.c,v 1.4 2004-06-13 12:35:30 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 @@ -147,8 +147,6 @@ const struct rig_caps tmv7_caps = { }, .priv = (void *)&tmv7_priv_caps, -.rig_init = kenwood_init, -.rig_cleanup = kenwood_cleanup, .rig_open = tmv7_open, .rig_close = NULL,