diff --git a/yaesu/frg100.c b/yaesu/frg100.c index 6ed784aa8..b053d8946 100644 --- a/yaesu/frg100.c +++ b/yaesu/frg100.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an FRG-100 using the "CAT" interface * - * $Id: frg100.c,v 1.4 2005-02-26 22:30:55 fillods Exp $ + * $Id: frg100.c,v 1.5 2006-10-07 15:51:38 csete 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 @@ -66,7 +66,9 @@ static int frg100_set_vfo(RIG *rig, vfo_t vfo); static int frg100_set_powerstat(RIG *rig, powerstat_t status); static int frg100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val); +#if 0 static int rig2mode(RIG *rig, int md, rmode_t *mode, pbwidth_t *width); +#endif static int mode2rig(RIG *rig, rmode_t mode, pbwidth_t width); /* @@ -88,7 +90,7 @@ const struct rig_caps frg100_caps = { .rig_model = RIG_MODEL_FRG100, .model_name = "FRG-100", .mfg_name = "Yaesu", - .version = "0.3", + .version = "0.4", .copyright = "LGPL", .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_RECEIVER, @@ -183,7 +185,7 @@ int frg100_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "frg100: frg100_open called\n"); /* send 0 delay pacing */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -196,7 +198,7 @@ int frg100_set_freq(RIG *rig, vfo_t vfo, freq_t freq) to_bcd(cmd, freq/10, 8); /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -208,7 +210,7 @@ int frg100_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) /* fill in p1 */ cmd[3] = mode2rig(rig, mode, width); - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -224,7 +226,7 @@ int frg100_set_powerstat(RIG *rig, powerstat_t status) cmd[3] = status == RIG_POWER_OFF ? 0x00 : 0x01; /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -248,7 +250,7 @@ int frg100_set_vfo(RIG *rig, vfo_t vfo) return -RIG_EINVAL; /* sorry, wrong VFO */ } - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -263,12 +265,12 @@ int frg100_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) serial_flush(&rig->state.rigport); /* send READ STATUS(Meter only) cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 5); + retval = read_block(&rig->state.rigport, (char *) cmd, 5); if (retval < 1) { rig_debug(RIG_DEBUG_ERR,"%s: read meter failed %d\n", @@ -329,6 +331,8 @@ int mode2rig(RIG *rig, rmode_t mode, pbwidth_t width) return md; } +/* function not used */ +#if 0 int rig2mode(RIG *rig, int md, rmode_t *mode, pbwidth_t *width) { /* @@ -353,4 +357,4 @@ int rig2mode(RIG *rig, int md, rmode_t *mode, pbwidth_t *width) return RIG_OK; } - +#endif diff --git a/yaesu/frg8800.c b/yaesu/frg8800.c index 41232af0b..db6a081e0 100644 --- a/yaesu/frg8800.c +++ b/yaesu/frg8800.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an FRG-8800 using the "CAT" interface * - * $Id: frg8800.c,v 1.1 2004-05-16 07:32:57 fillods Exp $ + * $Id: frg8800.c,v 1.2 2006-10-07 15:51:38 csete 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 @@ -62,7 +62,7 @@ const struct rig_caps frg8800_caps = { .rig_model = RIG_MODEL_FRG8800, .model_name = "FRG-8800", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_RECEIVER, @@ -163,7 +163,7 @@ int frg8800_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "frg8800: frg8800_open called\n"); /* send Ext Cntl ON: Activate CAT */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -174,7 +174,7 @@ int frg8800_close(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "frg8800: frg8800_close called\n"); /* send Ext Cntl OFF: Deactivate CAT */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -192,7 +192,7 @@ int frg8800_set_freq(RIG *rig, vfo_t vfo, freq_t freq) cmd[0] = ( cmd[0]&0xf0 ) | ( 1 << ((((long long)freq)%100)/25) ); /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -225,7 +225,7 @@ int frg8800_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) cmd[3] = md; /* Mode set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -239,6 +239,6 @@ int frg8800_set_powerstat(RIG *rig, powerstat_t status) cmd[3] = status == RIG_POWER_OFF ? 0xff : 0xfe; /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } diff --git a/yaesu/frg9600.c b/yaesu/frg9600.c index 5f3c0d0f9..a66ccdfe6 100644 --- a/yaesu/frg9600.c +++ b/yaesu/frg9600.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an FRG-9600 using the "CAT" interface * - * $Id: frg9600.c,v 1.1 2004-08-10 21:08:41 fillods Exp $ + * $Id: frg9600.c,v 1.2 2006-10-07 15:51:38 csete 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 @@ -57,7 +57,7 @@ const struct rig_caps frg9600_caps = { .rig_model = RIG_MODEL_FRG9600, .model_name = "FRG-9600", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_RECEIVER, @@ -151,7 +151,7 @@ int frg9600_set_freq(RIG *rig, vfo_t vfo, freq_t freq) to_bcd_be(cmd+1, freq/10, 8); /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -183,6 +183,6 @@ int frg9600_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) cmd[0] = md; /* Mode set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } diff --git a/yaesu/ft100.c b/yaesu/ft100.c index 42507180b..fa538c1af 100644 --- a/yaesu/ft100.c +++ b/yaesu/ft100.c @@ -7,7 +7,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft100.c,v 1.17 2005-04-03 19:27:59 fillods Exp $ + * $Id: ft100.c,v 1.18 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -158,7 +158,7 @@ const struct rig_caps ft100_caps = { .rig_model = RIG_MODEL_FT100, .model_name = "FT-100", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -381,7 +381,7 @@ static int ft100_send_priv_cmd(RIG *rig, unsigned char cmd_index) { rig_debug(RIG_DEBUG_VERBOSE," %3i",(int)cmd[i]); rig_debug(RIG_DEBUG_VERBOSE," \n"); - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -426,7 +426,7 @@ int ft100_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { rig_debug(RIG_DEBUG_VERBOSE,"ft100: requested freq after conversion = %"PRIfreq" Hz \n", from_bcd_be(p->p_cmd,8)* 10 ); cmd = p->p_cmd; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -534,7 +534,7 @@ int ft100_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) { serial_flush( &rig->state.rigport ); ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_READ_STATUS ); - n = read_block( &rig->state.rigport, data, sizeof(FT100_STATUS_INFO) ); + n = read_block( &rig->state.rigport, (char *) data, sizeof(FT100_STATUS_INFO) ); switch( data[5] & 0x0f ) { case 0x00: @@ -645,7 +645,7 @@ int ft100_get_vfo(RIG *rig, vfo_t *vfo) { serial_flush( &rig->state.rigport ); ft100_send_priv_cmd( rig, FT100_NATIVE_CAT_READ_FLAGS ); - n = read_block( &rig->state.rigport, ft100_flags, sizeof(FT100_FLAG_INFO) ); + n = read_block( &rig->state.rigport, (char *) ft100_flags, sizeof(FT100_FLAG_INFO) ); rig_debug(RIG_DEBUG_VERBOSE,"ft100: read flags=%i \n",n); if ((ft100_flags[1] & 4) == 4) { @@ -822,7 +822,7 @@ int ft100_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code) { cmd[3]=(char)code; - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -863,7 +863,7 @@ int ft100_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone) { cmd[3]=(char)tone; - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } diff --git a/yaesu/ft1000mp.c b/yaesu/ft1000mp.c index a8187137f..af8b74d38 100644 --- a/yaesu/ft1000mp.c +++ b/yaesu/ft1000mp.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an FT-1000MP using the "CAT" interface * - * $Id: ft1000mp.c,v 1.6 2005-02-26 23:13:12 fillods Exp $ + * $Id: ft1000mp.c,v 1.7 2006-10-07 15:51:38 csete 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 @@ -207,7 +207,7 @@ const struct rig_caps ft1000mp_caps = { .rig_model = RIG_MODEL_FT1000MP, .model_name = "FT-1000MP", .mfg_name = "Yaesu", - .version = "0.0.5", + .version = "0.1", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -658,7 +658,7 @@ int ft1000mp_open(RIG *rig) { /* send PACING cmd to rig */ cmd = p->p_cmd; - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); /* TODO */ @@ -711,7 +711,7 @@ int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { from_bcd(p->p_cmd,8)* 10 ); cmd = p->p_cmd; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -1022,7 +1022,7 @@ int ft1000mp_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit) { priv->p_cmd[2] = rit >= 0 ? 0x00 : 0xff; cmd = priv->p_cmd; /* get native sequence */ - write_block(&rs->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rs->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -1107,7 +1107,7 @@ int ft1000mp_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit) { priv->p_cmd[2] = xit >= 0 ? 0x00 : 0xff; cmd = priv->p_cmd; /* get native sequence */ - write_block(&rs->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rs->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -1218,9 +1218,9 @@ int ft1000mp_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) memset(&priv->p_cmd, m, YAESU_CMD_LENGTH-1); priv->p_cmd[4] = 0xf7; - write_block(&rs->rigport, priv->p_cmd, YAESU_CMD_LENGTH); + write_block(&rs->rigport, (char *) priv->p_cmd, YAESU_CMD_LENGTH); - retval = read_block(&rs->rigport, lvl_data, YAESU_CMD_LENGTH); + retval = read_block(&rs->rigport, (char *) lvl_data, YAESU_CMD_LENGTH); if (retval != YAESU_CMD_LENGTH) { rig_debug(RIG_DEBUG_ERR,"ft1000mp_get_level: ack NG %d", retval); return retval; @@ -1282,7 +1282,7 @@ static int ft1000mp_get_update_data(RIG *rig, unsigned char ci, unsigned char rl /* send UPDATE comand to fetch data*/ ft1000mp_send_priv_cmd(rig, ci); - n = read_block(&rig_s->rigport, p->update_data, rl); + n = read_block(&rig_s->rigport, (char *) p->update_data, rl); return n; @@ -1317,7 +1317,7 @@ static int ft1000mp_send_priv_cmd(RIG *rig, unsigned char ci) { } cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; diff --git a/yaesu/ft736.c b/yaesu/ft736.c index 8a0e8ed00..828379cc7 100644 --- a/yaesu/ft736.c +++ b/yaesu/ft736.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an FT-736R using the "CAT" interface * - * $Id: ft736.c,v 1.2 2005-04-03 18:37:09 fillods Exp $ + * $Id: ft736.c,v 1.3 2006-10-07 15:51:38 csete 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 @@ -79,7 +79,7 @@ const struct rig_caps ft736_caps = { .rig_model = RIG_MODEL_FT736R, .model_name = "FT-736R", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -196,7 +196,7 @@ int ft736_open(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s called\n",__FUNCTION__); /* send Ext Cntl ON: Activate CAT */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -207,7 +207,7 @@ int ft736_close(RIG *rig) rig_debug(RIG_DEBUG_TRACE, "%s called\n",__FUNCTION__); /* send Ext Cntl OFF: Deactivate CAT */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -224,7 +224,7 @@ int ft736_set_freq(RIG *rig, vfo_t vfo, freq_t freq) cmd[0] = (cmd[0] & 0x0f) | 0xc0; /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -264,7 +264,7 @@ int ft736_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) cmd[0] = md; /* Mode set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -279,7 +279,7 @@ int ft736_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo) */ cmd[4] = split == RIG_SPLIT_ON ? 0x0e : 0x8e; - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } int ft736_set_split_freq(RIG *rig, vfo_t vfo, freq_t freq) @@ -294,7 +294,7 @@ int ft736_set_split_freq(RIG *rig, vfo_t vfo, freq_t freq) cmd[0] = (cmd[0] & 0x0f) | 0xc0; /* Frequency set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -326,7 +326,7 @@ int ft736_set_split_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) cmd[0] = md; /* Mode set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -339,7 +339,7 @@ int ft736_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) cmd[4] = ptt == RIG_PTT_ON ? 0x08 : 0x88; /* Tx/Rx set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } int ft736_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) @@ -349,13 +349,13 @@ int ft736_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) serial_flush(&rig->state.rigport); - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 5); + retval = read_block(&rig->state.rigport, (char *) cmd, 5); if (retval < 1) { rig_debug(RIG_DEBUG_ERR,"%s: read squelch failed %d\n", @@ -379,12 +379,12 @@ int ft736_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) serial_flush(&rig->state.rigport); /* send Test S-meter cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 5); + retval = read_block(&rig->state.rigport, (char *) cmd, 5); if (retval < 1) { rig_debug(RIG_DEBUG_ERR,"%s: read meter failed %d\n", @@ -417,7 +417,7 @@ int ft736_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t shift) return -RIG_EINVAL; } - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } int ft736_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs) @@ -428,6 +428,6 @@ int ft736_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs) to_bcd_be(cmd,offs,8); /* Offset set */ - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } diff --git a/yaesu/ft747.c b/yaesu/ft747.c index 4e9de9d7f..6ab6ea9e0 100644 --- a/yaesu/ft747.c +++ b/yaesu/ft747.c @@ -7,7 +7,7 @@ * box (FIF-232C) or similar * * - * $Id: ft747.c,v 1.21 2005-01-25 00:21:58 fillods Exp $ + * $Id: ft747.c,v 1.22 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -145,7 +145,7 @@ const struct rig_caps ft747_caps = { .rig_model = RIG_MODEL_FT747, .model_name = "FT-747GX", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_MOBILE, @@ -400,7 +400,7 @@ int ft747_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { rig_debug(RIG_DEBUG_VERBOSE,"ft747: requested freq after conversion = %"PRIll" Hz \n", from_bcd(p->p_cmd,8)* 10 ); cmd = p->p_cmd; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -780,14 +780,14 @@ static int ft747_get_update_data(RIG *rig) { /* send PACING cmd to rig */ cmd = p->p_cmd; - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); /* send UPDATE comand to fetch data*/ ft747_send_priv_cmd(rig,FT_747_NATIVE_UPDATE); /* n = read_sleep(rig_s->fd,p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH, FT747_DEFAULT_READ_TIMEOUT); */ - n = read_block(&rig_s->rigport, p->update_data, + n = read_block(&rig_s->rigport, (char *) p->update_data, FT747_STATUS_UPDATE_DATA_LENGTH); return 0; @@ -823,7 +823,7 @@ static int ft747_send_priv_cmd(RIG *rig, unsigned char ci) { } cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; diff --git a/yaesu/ft757gx.c b/yaesu/ft757gx.c index e504c06d0..508a68638 100644 --- a/yaesu/ft757gx.c +++ b/yaesu/ft757gx.c @@ -7,7 +7,7 @@ * box (FIF-232C) or similar * * - * $Id: ft757gx.c,v 1.3 2004-08-10 21:03:56 fillods Exp $ + * $Id: ft757gx.c,v 1.4 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -132,7 +132,7 @@ const struct rig_caps ft757gx_caps = { .rig_model = RIG_MODEL_FT757, .model_name = "FT-757GX", .mfg_name = "Yaesu", - .version = "0.2", + .version = "0.3", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_MOBILE, @@ -411,10 +411,12 @@ int ft757_open(RIG *rig) serial_flush(&rig->state.rigport); /* send 0 delay PACING cmd to rig */ - write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); /* read back the 75 status bytes */ - retval = read_block(&rig->state.rigport, priv->update_data, FT757GX_STATUS_UPDATE_DATA_LENGTH); + retval = read_block(&rig->state.rigport, + (char *) priv->update_data, + FT757GX_STATUS_UPDATE_DATA_LENGTH); if (retval != FT757GX_STATUS_UPDATE_DATA_LENGTH) { @@ -441,7 +443,7 @@ int ft757_set_freq(RIG *rig, vfo_t vfo, freq_t freq) /* fill in first four bytes */ to_bcd(cmd, freq/10, 8); - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } int ft757_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) @@ -452,7 +454,7 @@ int ft757_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) /* fill in p1 */ cmd[3] = mode2rig(rig, mode, width); - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -543,7 +545,7 @@ int ft757_set_vfo(RIG *rig, vfo_t vfo) { priv->current_vfo = vfo; - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -590,12 +592,12 @@ int ft757_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) serial_flush(&rig->state.rigport); /* send READ STATUS(Meter only) cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 1); + retval = read_block(&rig->state.rigport, (char *) cmd, 1); if (retval != 1) { rig_debug(RIG_DEBUG_ERR,"%s: read meter failed %d\n", @@ -625,12 +627,14 @@ int ft757_get_update_data(RIG *rig) serial_flush(&rig->state.rigport); /* send READ STATUS cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 75 status bytes */ - retval = read_block(&rig->state.rigport, priv->update_data, FT757GX_STATUS_UPDATE_DATA_LENGTH); + retval = read_block(&rig->state.rigport, + (char *) priv->update_data, + FT757GX_STATUS_UPDATE_DATA_LENGTH); if (retval != FT757GX_STATUS_UPDATE_DATA_LENGTH) { diff --git a/yaesu/ft817.c b/yaesu/ft817.c index 7403c4048..3d68190e9 100644 --- a/yaesu/ft817.c +++ b/yaesu/ft817.c @@ -11,7 +11,7 @@ * copied back and adopted for the FT-817. * * - * $Id: ft817.c,v 1.13 2006-03-22 21:31:09 csete Exp $ + * $Id: ft817.c,v 1.14 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -149,7 +149,7 @@ const struct rig_caps ft817_caps = { .rig_model = RIG_MODEL_FT817, .model_name = "FT-817", .mfg_name = "Yaesu", - .version = "0.2", + .version = "0.3", .copyright = "LGPL", .status = RIG_STATUS_BETA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -440,9 +440,9 @@ static int ft817_get_status(RIG *rig, int status) serial_flush(&rig->state.rigport); - write_block(&rig->state.rigport, p->pcs[status].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[status].nseq, YAESU_CMD_LENGTH); - if ((n = read_block(&rig->state.rigport, data, len)) < 0) + if ((n = read_block(&rig->state.rigport, (char *) data, len)) < 0) return n; if (n != len) @@ -658,7 +658,7 @@ int ft817_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) static int ft817_read_ack(RIG *rig) { #if (FT817_POST_WRITE_DELAY == 0) - unsigned char dummy; + char dummy; int n; if ((n = read_block(&rig->state.rigport, &dummy, 1)) < 0) { @@ -688,7 +688,7 @@ static int ft817_send_cmd(RIG *rig, int index) return -RIG_EINTERNAL; } - write_block(&rig->state.rigport, p->pcs[index].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[index].nseq, YAESU_CMD_LENGTH); return ft817_read_ack(rig); } @@ -708,7 +708,7 @@ static int ft817_send_icmd(RIG *rig, int index, unsigned char *data) cmd[YAESU_CMD_LENGTH - 1] = p->pcs[index].nseq[YAESU_CMD_LENGTH - 1]; memcpy(cmd, data, YAESU_CMD_LENGTH - 1); - write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); return ft817_read_ack(rig); } diff --git a/yaesu/ft847.c b/yaesu/ft847.c index 44be049e1..e0af0a0d8 100644 --- a/yaesu/ft847.c +++ b/yaesu/ft847.c @@ -6,7 +6,7 @@ * via serial interface to an FT-847 using the "CAT" interface. * * - * $Id: ft847.c,v 1.30 2005-01-25 00:21:58 fillods Exp $ + * $Id: ft847.c,v 1.31 2006-10-07 15:51:38 csete Exp $ * * * @@ -184,7 +184,7 @@ const struct rig_caps ft847_caps = { .rig_model = RIG_MODEL_FT847, .model_name = "FT-847", .mfg_name = "Yaesu", -.version = "0.1.1", +.version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -426,7 +426,7 @@ static int ft847_send_priv_cmd(RIG *rig, unsigned char ci) { } cmd = (unsigned char *) p->pcs[cmd_index].nseq; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; @@ -483,7 +483,7 @@ int ft847_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { rig_debug(RIG_DEBUG_VERBOSE,"ft847: requested freq after conversion = %"PRIll" Hz \n", from_bcd_be(p->p_cmd,8)* 10 ); cmd = p->p_cmd; /* get native sequence */ - write_block(&rig_s->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig_s->rigport, (char *) cmd, YAESU_CMD_LENGTH); return RIG_OK; } @@ -533,9 +533,9 @@ static int get_freq_and_mode(RIG *rig, vfo_t vfo, freq_t *freq, rmode_t *mode, memcpy(p->p_cmd,&ncmd[cmd_index].nseq,YAESU_CMD_LENGTH); cmd = p->p_cmd; - write_block(&rs->rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rs->rigport, (char *) cmd, YAESU_CMD_LENGTH); - n = read_block(&rs->rigport, data, YAESU_CMD_LENGTH); + n = read_block(&rs->rigport, (char *) data, YAESU_CMD_LENGTH); if (n != YAESU_CMD_LENGTH) { rig_debug(RIG_DEBUG_ERR,"ft847: read_block returned %d\n", n); return n < 0 ? n : -RIG_EPROTO; diff --git a/yaesu/ft857.c b/yaesu/ft857.c index 73d75e126..6b4899a49 100644 --- a/yaesu/ft857.c +++ b/yaesu/ft857.c @@ -13,7 +13,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft857.c,v 1.8 2005-04-10 21:49:38 fillods Exp $ + * $Id: ft857.c,v 1.9 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -146,7 +146,7 @@ const struct rig_caps ft857_caps = { .rig_model = RIG_MODEL_FT857, .model_name = "FT-857", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -396,9 +396,9 @@ static int ft857_get_status(RIG *rig, int status) serial_flush(&rig->state.rigport); - write_block(&rig->state.rigport, p->pcs[status].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[status].nseq, YAESU_CMD_LENGTH); - if ((n = read_block(&rig->state.rigport, data, len)) < 0) + if ((n = read_block(&rig->state.rigport, (char *) data, len)) < 0) return n; if (n != len) @@ -570,7 +570,7 @@ int ft857_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) static int ft857_read_ack(RIG *rig) { #if (FT857_POST_WRITE_DELAY == 0) - unsigned char dummy; + char dummy; int n; if ((n = read_block(&rig->state.rigport, &dummy, 1)) < 0) { @@ -600,7 +600,7 @@ static int ft857_send_cmd(RIG *rig, int index) return -RIG_EINTERNAL; } - write_block(&rig->state.rigport, p->pcs[index].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[index].nseq, YAESU_CMD_LENGTH); return ft857_read_ack(rig); } @@ -620,7 +620,7 @@ static int ft857_send_icmd(RIG *rig, int index, unsigned char *data) cmd[YAESU_CMD_LENGTH - 1] = p->pcs[index].nseq[YAESU_CMD_LENGTH - 1]; memcpy(cmd, data, YAESU_CMD_LENGTH - 1); - write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); return ft857_read_ack(rig); } diff --git a/yaesu/ft890.c b/yaesu/ft890.c index d02124c8c..961e54d59 100644 --- a/yaesu/ft890.c +++ b/yaesu/ft890.c @@ -9,7 +9,7 @@ * via serial interface to an FT-890 using the "CAT" interface * * - * $Id: ft890.c,v 1.9 2005-04-10 21:49:38 fillods Exp $ + * $Id: ft890.c,v 1.10 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -154,7 +154,7 @@ const struct rig_caps ft890_caps = { .rig_model = RIG_MODEL_FT890, .model_name = "FT-890", .mfg_name = "Yaesu", - .version = "0.0.4", + .version = "0.1", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1395,7 +1395,7 @@ static int ft890_get_update_data(RIG *rig, unsigned char ci, unsigned char rl) { if (err != RIG_OK) return err; - n = read_block(&rig_s->rigport, priv->update_data, rl); + n = read_block(&rig_s->rigport, (char *) priv->update_data, rl); if (n < 0) return n; /* die returning read_block error */ @@ -1436,7 +1436,7 @@ static int ft890_send_static_cmd(RIG *rig, unsigned char ci) { return -RIG_EINVAL; } - err = write_block(&rig_s->rigport, (unsigned char *) priv->pcs[ci].nseq, + err = write_block(&rig_s->rigport, (char *) priv->pcs[ci].nseq, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1491,7 +1491,7 @@ static int ft890_send_dynamic_cmd(RIG *rig, unsigned char ci, priv->p_cmd[P3] = p3; priv->p_cmd[P4] = p4; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1546,7 +1546,7 @@ static int ft890_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq) { "%s: requested freq after conversion = %"PRIll" Hz\n", __func__, from_bcd(priv->p_cmd, FT890_BCD_DIAL)* 10); - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1619,7 +1619,7 @@ static int ft890_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit) { priv->p_cmd[P1] = p1; /* ick */ priv->p_cmd[P2] = p2; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; diff --git a/yaesu/ft897.c b/yaesu/ft897.c index 7f690d435..a9959c7d2 100644 --- a/yaesu/ft897.c +++ b/yaesu/ft897.c @@ -11,7 +11,7 @@ * The starting point for this code was Frank's ft847 implementation. * * - * $Id: ft897.c,v 1.6 2005-04-10 21:49:38 fillods Exp $ + * $Id: ft897.c,v 1.7 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -178,7 +178,7 @@ const struct rig_caps ft897_caps = { .rig_model = RIG_MODEL_FT897, .model_name = "FT-897", .mfg_name = "Yaesu", - .version = "0.2", + .version = "0.3", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -430,9 +430,9 @@ static int ft897_get_status(RIG *rig, int status) serial_flush(&rig->state.rigport); - write_block(&rig->state.rigport, p->pcs[status].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[status].nseq, YAESU_CMD_LENGTH); - if ((n = read_block(&rig->state.rigport, data, len)) < 0) + if ((n = read_block(&rig->state.rigport, (char *) data, len)) < 0) return n; if (n != len) @@ -642,7 +642,7 @@ int ft897_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) static int ft897_read_ack(RIG *rig) { #if (FT897_POST_WRITE_DELAY == 0) - unsigned char dummy; + char dummy; int n; if ((n = read_block(&rig->state.rigport, &dummy, 1)) < 0) { @@ -672,7 +672,7 @@ static int ft897_send_cmd(RIG *rig, int index) return -RIG_EINTERNAL; } - write_block(&rig->state.rigport, p->pcs[index].nseq, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) p->pcs[index].nseq, YAESU_CMD_LENGTH); return ft897_read_ack(rig); } @@ -692,7 +692,7 @@ static int ft897_send_icmd(RIG *rig, int index, unsigned char *data) cmd[YAESU_CMD_LENGTH - 1] = p->pcs[index].nseq[YAESU_CMD_LENGTH - 1]; memcpy(cmd, data, YAESU_CMD_LENGTH - 1); - write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); return ft897_read_ack(rig); } diff --git a/yaesu/ft900.c b/yaesu/ft900.c index f0cee24fe..d06256674 100644 --- a/yaesu/ft900.c +++ b/yaesu/ft900.c @@ -9,7 +9,7 @@ * via serial interface to an FT-900 using the "CAT" interface * * - * $Id: ft900.c,v 1.4 2005-04-10 21:49:38 fillods Exp $ + * $Id: ft900.c,v 1.5 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -154,7 +154,7 @@ const struct rig_caps ft900_caps = { .rig_model = RIG_MODEL_FT900, .model_name = "FT-900", .mfg_name = "Yaesu", - .version = "0.0.1", + .version = "0.1", .copyright = "LGPL", .status = RIG_STATUS_NEW, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1394,7 +1394,7 @@ static int ft900_get_update_data(RIG *rig, unsigned char ci, unsigned char rl) { if (err != RIG_OK) return err; - n = read_block(&rig_s->rigport, priv->update_data, rl); + n = read_block(&rig_s->rigport, (char *) priv->update_data, rl); if (n < 0) return n; /* die returning read_block error */ @@ -1435,7 +1435,7 @@ static int ft900_send_static_cmd(RIG *rig, unsigned char ci) { return -RIG_EINVAL; } - err = write_block(&rig_s->rigport, (unsigned char *) priv->pcs[ci].nseq, + err = write_block(&rig_s->rigport, (char *) priv->pcs[ci].nseq, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1490,7 +1490,7 @@ static int ft900_send_dynamic_cmd(RIG *rig, unsigned char ci, priv->p_cmd[P3] = p3; priv->p_cmd[P4] = p4; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1545,7 +1545,7 @@ static int ft900_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq) { "%s: requested freq after conversion = %"PRIll" Hz\n", __func__, from_bcd(priv->p_cmd, FT900_BCD_DIAL)* 10); - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1618,7 +1618,7 @@ static int ft900_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit) { priv->p_cmd[P1] = p1; /* ick */ priv->p_cmd[P2] = p2; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; diff --git a/yaesu/ft920.c b/yaesu/ft920.c index 3845e5ae0..af8aed09b 100644 --- a/yaesu/ft920.c +++ b/yaesu/ft920.c @@ -12,7 +12,7 @@ * pages 86 to 90 * * - * $Id: ft920.c,v 1.19 2005-04-10 21:49:38 fillods Exp $ + * $Id: ft920.c,v 1.20 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -147,7 +147,7 @@ const struct rig_caps ft920_caps = { .rig_model = RIG_MODEL_FT920, .model_name = "FT-920", .mfg_name = "Yaesu", - .version = "0.2.1", + .version = "0.3", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -499,7 +499,7 @@ static int ft920_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) { static int ft920_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width ) { struct ft920_priv_data *priv; - unsigned char cmd_index; /* index of sequence to send */ + unsigned char cmd_index = FT920_NATIVE_VFO_A_PASSBAND_WIDE; /* index of sequence to send */ unsigned char mode_parm; /* mode parameter */ int err; @@ -1328,7 +1328,7 @@ static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl) { rig_debug(RIG_DEBUG_TRACE, "%s: read pacing = %i\n", __func__, priv->pacing); - err = write_block(&rig_s->rigport, (unsigned char *) priv->p_cmd, YAESU_CMD_LENGTH); + err = write_block(&rig_s->rigport, (char *) priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1336,7 +1336,7 @@ static int ft920_get_update_data(RIG *rig, unsigned char ci, unsigned char rl) { if (err != RIG_OK) return err; - n = read_block(&rig_s->rigport, priv->update_data, rl); + n = read_block(&rig_s->rigport, (char *) priv->update_data, rl); if (n < 0) return n; /* die returning read_block error */ @@ -1380,7 +1380,7 @@ static int ft920_send_static_cmd(RIG *rig, unsigned char ci) { return -RIG_EINVAL; } - err = write_block(&rig_s->rigport, (unsigned char *) priv->pcs[ci].nseq, YAESU_CMD_LENGTH); + err = write_block(&rig_s->rigport, (char *) priv->pcs[ci].nseq, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1438,7 +1438,7 @@ static int ft920_send_dynamic_cmd(RIG *rig, unsigned char ci, priv->p_cmd[P3] = p3; priv->p_cmd[P4] = p4; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, YAESU_CMD_LENGTH); + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1496,7 +1496,7 @@ static int ft920_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq) { "%s: requested freq after conversion = %"PRIll" Hz\n", __func__, from_bcd(priv->p_cmd, FT920_BCD_DIAL)* 10); - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, YAESU_CMD_LENGTH); + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -1571,7 +1571,7 @@ static int ft920_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit) { priv->p_cmd[P1] = p1; /* ick */ priv->p_cmd[P2] = p2; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, YAESU_CMD_LENGTH); + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; diff --git a/yaesu/ft990.c b/yaesu/ft990.c index 679b2562d..f0f25a0e1 100644 --- a/yaesu/ft990.c +++ b/yaesu/ft990.c @@ -7,7 +7,7 @@ * via serial interface to an FT-990 using the "CAT" interface * * - * $Id: ft990.c,v 1.17 2006-02-26 06:25:32 bwulf Exp $ + * $Id: ft990.c,v 1.18 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -135,7 +135,7 @@ const struct rig_caps ft990_caps = { .rig_model = RIG_MODEL_FT990, .model_name = "FT-990", .mfg_name = "Yaesu", - .version = "0.0.6", + .version = "0.1", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1975,7 +1975,7 @@ int ft990_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value) return err; rig_s = &rig->state; - err = read_block(&rig_s->rigport, mdata, FT990_READ_METER_LENGTH); + err = read_block(&rig_s->rigport, (char *) mdata, FT990_READ_METER_LENGTH); if (err < 0) return err; @@ -2687,7 +2687,7 @@ int ft990_send_static_cmd(RIG *rig, unsigned char ci) { return -RIG_EINVAL; } - err = write_block(&rig_s->rigport, (unsigned char *) priv->pcs[ci].nseq, + err = write_block(&rig_s->rigport, (char *) priv->pcs[ci].nseq, YAESU_CMD_LENGTH); if (err != RIG_OK) @@ -2742,7 +2742,7 @@ int ft990_send_dynamic_cmd(RIG *rig, unsigned char ci, priv->p_cmd[1] = p3; priv->p_cmd[0] = p4; - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) return err; @@ -2796,7 +2796,7 @@ int ft990_send_dial_freq(RIG *rig, unsigned char ci, freq_t freq) { "%s: requested freq after conversion = %"PRIll" Hz\n", __func__, from_bcd(priv->p_cmd, FT990_BCD_DIAL) * 10); - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if (err != RIG_OK) @@ -2853,7 +2853,7 @@ int ft990_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit) { // Store bcd format into privat command storage area to_bcd(priv->p_cmd, labs(rit)/10, FT990_BCD_RIT); - err = write_block(&rig_s->rigport, (unsigned char *) &priv->p_cmd, + err = write_block(&rig_s->rigport, (char *) &priv->p_cmd, YAESU_CMD_LENGTH); if(err != RIG_OK) diff --git a/yaesu/vr5000.c b/yaesu/vr5000.c index 8a7ebd2fd..cd6b07d99 100644 --- a/yaesu/vr5000.c +++ b/yaesu/vr5000.c @@ -4,7 +4,7 @@ * This shared library provides an API for communicating * via serial interface to an VR-5000 using the "CAT" interface * - * $Id: vr5000.c,v 1.2 2005-03-13 18:30:44 fillods Exp $ + * $Id: vr5000.c,v 1.3 2006-10-07 15:51:38 csete 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 @@ -127,7 +127,7 @@ const struct rig_caps vr5000_caps = { .rig_model = RIG_MODEL_VR5000, .model_name = "VR-5000", .mfg_name = "Yaesu", - .version = "0.1", + .version = "0.2", .copyright = "LGPL", .status = RIG_STATUS_ALPHA, .rig_type = RIG_TYPE_RECEIVER, @@ -277,12 +277,12 @@ int vr5000_open(RIG *rig) int retval; /* CAT write command on */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval != RIG_OK) return retval; /* disable RIG_VFO_B (only on display) */ - retval = write_block(&rig->state.rigport, b_off, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) b_off, YAESU_CMD_LENGTH); if (retval != RIG_OK) return retval; @@ -306,7 +306,7 @@ int vr5000_close(RIG *rig) { unsigned char cmd[YAESU_CMD_LENGTH] = { 0x00, 0x00, 0x00, 0x00, 0x80}; - return write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); } @@ -383,12 +383,12 @@ int vr5000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) serial_flush(&rig->state.rigport); /* send READ STATUS(Meter only) cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 1); + retval = read_block(&rig->state.rigport, (char *) cmd, 1); if (retval < 1) { rig_debug(RIG_DEBUG_ERR,"%s: read meter failed %d\n", @@ -412,12 +412,12 @@ int vr5000_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) serial_flush(&rig->state.rigport); /* send READ STATUS(Meter only) cmd to rig */ - retval = write_block(&rig->state.rigport, cmd, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd, YAESU_CMD_LENGTH); if (retval < 0) return retval; /* read back the 1 byte */ - retval = read_block(&rig->state.rigport, cmd, 1); + retval = read_block(&rig->state.rigport, (char *) cmd, 1); if (retval < 1) { rig_debug(RIG_DEBUG_ERR,"%s: read meter failed %d\n", @@ -544,7 +544,7 @@ int set_vr5000(RIG *rig, vfo_t vfo,freq_t freq,rmode_t mode, pbwidth_t width,sho /* fill in m2 */ cmd_mode_ts[1] = steps[i]; - retval = write_block(&rig->state.rigport, cmd_mode_ts, YAESU_CMD_LENGTH); + retval = write_block(&rig->state.rigport, (char *) cmd_mode_ts, YAESU_CMD_LENGTH); if (retval != RIG_OK) return retval; @@ -560,7 +560,7 @@ int set_vr5000(RIG *rig, vfo_t vfo,freq_t freq,rmode_t mode, pbwidth_t width,sho cmd_freq[3] = frq & 0xff; /* frequency set */ - return write_block(&rig->state.rigport, cmd_freq, YAESU_CMD_LENGTH); + return write_block(&rig->state.rigport, (char *) cmd_freq, YAESU_CMD_LENGTH); } diff --git a/yaesu/yaesu.c b/yaesu/yaesu.c index 8a935aeb7..508103195 100644 --- a/yaesu/yaesu.c +++ b/yaesu/yaesu.c @@ -7,7 +7,7 @@ * via serial interface to a Yaesu rig * * - * $Id: yaesu.c,v 1.24 2005-02-26 23:44:41 fillods Exp $ + * $Id: yaesu.c,v 1.25 2006-10-07 15:51:38 csete Exp $ * * * This library is free software; you can redistribute it and/or @@ -139,8 +139,8 @@ DECLARE_PROBERIG_BACKEND(yaesu) return RIG_MODEL_NONE; /* send READ STATUS cmd to rig */ - retval = write_block(port, cmd, YAESU_CMD_LENGTH); - id_len = read_block(port, idbuf, YAESU_CMD_LENGTH); + retval = write_block(port, (char *) cmd, YAESU_CMD_LENGTH); + id_len = read_block(port, (char *) idbuf, YAESU_CMD_LENGTH); close(port->fd);