Skip to content

Commit d17290b

Browse files
GeoBaltzGeoBaltz
committed
Use sed -i on all in rigs/kit/
Under 1800 to go.
1 parent d6dcd4a commit d17290b

File tree

12 files changed

+166
-166
lines changed

12 files changed

+166
-166
lines changed

‎rigs/kit/dds60.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ int dds60_init(RIG *rig)
168168
{
169169
struct dds60_priv_data *priv;
170170

171-
rig->state.priv = (struct dds60_priv_data *)calloc(1, sizeof(
171+
STATE(rig)->priv = (struct dds60_priv_data *)calloc(1, sizeof(
172172
struct dds60_priv_data));
173173

174-
if (!rig->state.priv)
174+
if (!STATE(rig)->priv)
175175
{
176176
/* whoops! memory shortage! */
177177
return -RIG_ENOMEM;
178178
}
179179

180-
priv = rig->state.priv;
180+
priv = STATE(rig)->priv;
181181

182182
priv->osc_freq = OSCFREQ;
183183
priv->if_mix_freq = IFMIXFREQ;
@@ -194,26 +194,26 @@ int dds60_cleanup(RIG *rig)
194194
return -RIG_EINVAL;
195195
}
196196

197-
if (rig->state.priv)
197+
if (STATE(rig)->priv)
198198
{
199-
free(rig->state.priv);
199+
free(STATE(rig)->priv);
200200
}
201201

202-
rig->state.priv = NULL;
202+
STATE(rig)->priv = NULL;
203203

204204
return RIG_OK;
205205
}
206206

207207

208208
/*
209-
* Assumes rig!=NULL, rig->state.priv!=NULL
209+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
210210
*/
211211
int dds60_set_conf(RIG *rig, hamlib_token_t token, const char *val)
212212
{
213213
struct dds60_priv_data *priv;
214214
float phase;
215215

216-
priv = (struct dds60_priv_data *)rig->state.priv;
216+
priv = (struct dds60_priv_data *)STATE(rig)->priv;
217217

218218
switch (token)
219219
{
@@ -243,14 +243,14 @@ int dds60_set_conf(RIG *rig, hamlib_token_t token, const char *val)
243243

244244
/*
245245
* assumes rig!=NULL,
246-
* Assumes rig!=NULL, rig->state.priv!=NULL
246+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
247247
* and val points to a buffer big enough to hold the conf value.
248248
*/
249249
int dds60_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len)
250250
{
251251
struct dds60_priv_data *priv;
252252

253-
priv = (struct dds60_priv_data *)rig->state.priv;
253+
priv = (struct dds60_priv_data *)STATE(rig)->priv;
254254

255255
switch (token)
256256
{
@@ -351,7 +351,7 @@ int dds60_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
351351
hamlib_port_t *port = RIGPORT(rig);
352352
freq_t osc_ref;
353353

354-
priv = (struct dds60_priv_data *)rig->state.priv;
354+
priv = (struct dds60_priv_data *)STATE(rig)->priv;
355355

356356
if (priv->multiplier)
357357
{

‎rigs/kit/drt1.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ int drt1_init(RIG *rig)
168168
{
169169
struct drt1_priv_data *priv;
170170

171-
rig->state.priv = (struct drt1_priv_data *)calloc(1, sizeof(
171+
STATE(rig)->priv = (struct drt1_priv_data *)calloc(1, sizeof(
172172
struct drt1_priv_data));
173173

174-
if (!rig->state.priv)
174+
if (!STATE(rig)->priv)
175175
{
176176
/* whoops! memory shortage! */
177177
return -RIG_ENOMEM;
178178
}
179179

180-
priv = rig->state.priv;
180+
priv = STATE(rig)->priv;
181181

182182
priv->osc_freq = OSCFREQ;
183183
priv->ref_mult = REFMULT;
@@ -194,25 +194,25 @@ int drt1_cleanup(RIG *rig)
194194
return -RIG_EINVAL;
195195
}
196196

197-
if (rig->state.priv)
197+
if (STATE(rig)->priv)
198198
{
199-
free(rig->state.priv);
199+
free(STATE(rig)->priv);
200200
}
201201

202-
rig->state.priv = NULL;
202+
STATE(rig)->priv = NULL;
203203

204204
return RIG_OK;
205205
}
206206

207207

208208
/*
209-
* Assumes rig!=NULL, rig->state.priv!=NULL
209+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
210210
*/
211211
int drt1_set_conf(RIG *rig, hamlib_token_t token, const char *val)
212212
{
213213
struct drt1_priv_data *priv;
214214

215-
priv = (struct drt1_priv_data *)rig->state.priv;
215+
priv = (struct drt1_priv_data *)STATE(rig)->priv;
216216

217217
switch (token)
218218
{
@@ -241,14 +241,14 @@ int drt1_set_conf(RIG *rig, hamlib_token_t token, const char *val)
241241

242242
/*
243243
* assumes rig!=NULL,
244-
* Assumes rig!=NULL, rig->state.priv!=NULL
244+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
245245
* and val points to a buffer big enough to hold the conf value.
246246
*/
247247
int drt1_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len)
248248
{
249249
struct drt1_priv_data *priv;
250250

251-
priv = (struct drt1_priv_data *)rig->state.priv;
251+
priv = (struct drt1_priv_data *)STATE(rig)->priv;
252252

253253
switch (token)
254254
{
@@ -414,7 +414,7 @@ int drt1_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
414414
struct drt1_priv_data *priv;
415415
hamlib_port_t *port = RIGPORT(rig);
416416

417-
priv = (struct drt1_priv_data *)rig->state.priv;
417+
priv = (struct drt1_priv_data *)STATE(rig)->priv;
418418

419419
rig_flush(port);
420420

‎rigs/kit/dwt.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,16 @@ int dwtdll_init(RIG *rig)
226226
{
227227
struct dwtdll_priv_data *priv;
228228

229-
rig->state.priv = (struct dwtdll_priv_data *)calloc(1, sizeof(
229+
STATE(rig)->priv = (struct dwtdll_priv_data *)calloc(1, sizeof(
230230
struct dwtdll_priv_data));
231231

232-
if (!rig->state.priv)
232+
if (!STATE(rig)->priv)
233233
{
234234
/* whoops! memory shortage! */
235235
return -RIG_ENOMEM;
236236
}
237237

238-
priv = rig->state.priv;
238+
priv = STATE(rig)->priv;
239239

240240
/* Try to load required dll */
241241
priv->dll = LoadLibrary(DWTDLL);
@@ -244,7 +244,7 @@ int dwtdll_init(RIG *rig)
244244
{
245245
rig_debug(RIG_DEBUG_ERR, "%s: Unable to LoadLibrary %s\n",
246246
__func__, DWTDLL);
247-
free(rig->state.priv);
247+
free(STATE(rig)->priv);
248248
return -RIG_EIO; /* huh! */
249249
}
250250

@@ -295,7 +295,7 @@ int dwtdll_init(RIG *rig)
295295

296296
int dwtdll_open(RIG *rig)
297297
{
298-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
298+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
299299
short ret;
300300

301301
/* Open DWT receiver */
@@ -319,7 +319,7 @@ int dwtdll_open(RIG *rig)
319319

320320
int dwtdll_close(RIG *rig)
321321
{
322-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
322+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
323323
short ret;
324324

325325
/* Open DWT receiver */
@@ -335,24 +335,24 @@ int dwtdll_close(RIG *rig)
335335

336336
int dwtdll_cleanup(RIG *rig)
337337
{
338-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
338+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
339339

340340
/* Clean up the dll access */
341341
if (priv) { FreeLibrary(priv->dll); }
342342

343-
if (rig->state.priv)
343+
if (STATE(rig)->priv)
344344
{
345-
free(rig->state.priv);
345+
free(STATE(rig)->priv);
346346
}
347347

348-
rig->state.priv = NULL;
348+
STATE(rig)->priv = NULL;
349349

350350
return RIG_OK;
351351
}
352352

353353
int dwtdll_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
354354
{
355-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
355+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
356356
short ret;
357357

358358
ret = priv->FrontendSetFrequency((double) freq);
@@ -362,7 +362,7 @@ int dwtdll_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
362362

363363
int dwtdll_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
364364
{
365-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
365+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
366366

367367
*freq = (freq_t) priv->FrontendGetFrequency();
368368

@@ -371,7 +371,7 @@ int dwtdll_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
371371

372372
int dwtdll_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
373373
{
374-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
374+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
375375
tFrontendMode dwtmode;
376376
short ret;
377377

@@ -394,7 +394,7 @@ int dwtdll_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
394394

395395
int dwtdll_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
396396
{
397-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
397+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
398398
tFrontendMode dwtmode;
399399

400400
dwtmode = priv->FrontendGetMode();
@@ -419,7 +419,7 @@ int dwtdll_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
419419

420420
int dwtdll_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
421421
{
422-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
422+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
423423
short ret = 0;
424424

425425
switch (level)
@@ -437,7 +437,7 @@ int dwtdll_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
437437

438438
int dwtdll_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
439439
{
440-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
440+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
441441
signed short ret = 0;
442442

443443
switch (level)
@@ -489,7 +489,7 @@ int dwtdll_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
489489

490490
static const char *dwtdll_get_info(RIG *rig)
491491
{
492-
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
492+
struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)STATE(rig)->priv;
493493
static char info[22];
494494

495495
if (priv->FrontendGetId(info) < 0)

‎rigs/kit/elektor304.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,16 @@ int elektor304_init(RIG *rig)
160160
{
161161
struct elektor304_priv_data *priv;
162162

163-
rig->state.priv = (struct elektor304_priv_data *)calloc(1, sizeof(struct
163+
STATE(rig)->priv = (struct elektor304_priv_data *)calloc(1, sizeof(struct
164164
elektor304_priv_data));
165165

166-
if (!rig->state.priv)
166+
if (!STATE(rig)->priv)
167167
{
168168
/* whoops! memory shortage! */
169169
return -RIG_ENOMEM;
170170
}
171171

172-
priv = rig->state.priv;
172+
priv = STATE(rig)->priv;
173173

174174
priv->osc_freq = OSCFREQ;
175175
priv->if_mix_freq = IFMIXFREQ;
@@ -184,25 +184,25 @@ int elektor304_cleanup(RIG *rig)
184184
return -RIG_EINVAL;
185185
}
186186

187-
if (rig->state.priv)
187+
if (STATE(rig)->priv)
188188
{
189-
free(rig->state.priv);
189+
free(STATE(rig)->priv);
190190
}
191191

192-
rig->state.priv = NULL;
192+
STATE(rig)->priv = NULL;
193193

194194
return RIG_OK;
195195
}
196196

197197

198198
/*
199-
* Assumes rig!=NULL, rig->state.priv!=NULL
199+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
200200
*/
201201
int elektor304_set_conf(RIG *rig, hamlib_token_t token, const char *val)
202202
{
203203
struct elektor304_priv_data *priv;
204204

205-
priv = (struct elektor304_priv_data *)rig->state.priv;
205+
priv = (struct elektor304_priv_data *)STATE(rig)->priv;
206206

207207
switch (token)
208208
{
@@ -223,14 +223,14 @@ int elektor304_set_conf(RIG *rig, hamlib_token_t token, const char *val)
223223

224224
/*
225225
* assumes rig!=NULL,
226-
* Assumes rig!=NULL, rig->state.priv!=NULL
226+
* Assumes rig!=NULL, STATE(rig)->priv!=NULL
227227
* and val points to a buffer big enough to hold the conf value.
228228
*/
229229
int elektor304_get_conf2(RIG *rig, hamlib_token_t token, char *val, int val_len)
230230
{
231231
struct elektor304_priv_data *priv;
232232

233-
priv = (struct elektor304_priv_data *)rig->state.priv;
233+
priv = (struct elektor304_priv_data *)STATE(rig)->priv;
234234

235235
switch (token)
236236
{
@@ -344,7 +344,7 @@ int elektor304_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
344344
struct elektor304_priv_data *priv;
345345
hamlib_port_t *port = RIGPORT(rig);
346346

347-
priv = (struct elektor304_priv_data *)rig->state.priv;
347+
priv = (struct elektor304_priv_data *)STATE(rig)->priv;
348348

349349
rig_flush(port);
350350

0 commit comments

Comments
 (0)