Menu
▾
▴
[Hamlib-cvs-digest] CVS: hamlib/aor aor.c, 1.39, 1.40 ar3000.c, 1.9, 1.10 ar3030.c, 1.9, 1.10 ar7030.c, 1.6, 1.7
|
From: Alexandru C. <cs...@us...> - 2006-10-07 21:10:15
|
Update of /cvsroot/hamlib/hamlib/aor In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23519 Modified Files: aor.c ar3000.c ar3030.c ar7030.c Log Message: - Fixed type mismatches and unhandled switch cases. - Incremented backend version numbers. Index: aor.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/aor/aor.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** aor.c 21 Apr 2005 20:19:41 -0000 1.39 --- aor.c 7 Oct 2006 21:10:11 -0000 1.40 *************** *** 76,80 **** int retval; struct rig_state *rs; ! unsigned char ackbuf[BUFSZ]; int ack_len; --- 76,80 ---- int retval; struct rig_state *rs; ! char ackbuf[BUFSZ]; int ack_len; *************** *** 159,163 **** int aor_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { ! unsigned char freqbuf[BUFSZ]; int freq_len; --- 159,163 ---- int aor_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { ! char freqbuf[BUFSZ]; int freq_len; *************** *** 177,181 **** char *rfp; int freq_len, retval; ! unsigned char freqbuf[BUFSZ]; retval = aor_transaction (rig, "RX" EOM, 3, freqbuf, &freq_len); --- 177,181 ---- char *rfp; int freq_len, retval; ! char freqbuf[BUFSZ]; retval = aor_transaction (rig, "RX" EOM, 3, freqbuf, &freq_len); *************** *** 228,232 **** { int vfo_len, retval; ! unsigned char vfobuf[BUFSZ]; retval = aor_transaction (rig, "RX" EOM, 3, vfobuf, &vfo_len); --- 228,232 ---- { int vfo_len, retval; ! char vfobuf[BUFSZ]; retval = aor_transaction (rig, "RX" EOM, 3, vfobuf, &vfo_len); *************** *** 307,311 **** { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! unsigned char mdbuf[BUFSZ]; int mdbuf_len, retval; --- 307,311 ---- { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! char mdbuf[BUFSZ]; int mdbuf_len, retval; *************** *** 365,370 **** { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! unsigned char ackbuf[BUFSZ], *mdp; ! unsigned char ackbuf2[BUFSZ], *mdp2; int ack_len, ack2_len, retval; --- 365,370 ---- { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! char ackbuf[BUFSZ], *mdp; ! char ackbuf2[BUFSZ], *mdp2; int ack_len, ack2_len, retval; *************** *** 405,409 **** int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) { ! unsigned char tsbuf[BUFSZ]; int ts_len; --- 405,409 ---- int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) { ! char tsbuf[BUFSZ]; int ts_len; *************** *** 425,429 **** { struct rig_state *rs; ! unsigned char lvlbuf[BUFSZ]; int lvl_len; unsigned i; --- 425,429 ---- { struct rig_state *rs; ! char lvlbuf[BUFSZ]; int lvl_len; unsigned i; *************** *** 476,480 **** { struct rig_state *rs; ! unsigned char lvlbuf[BUFSZ],ackbuf[BUFSZ]; int lvl_len, ack_len, retval; --- 476,480 ---- { struct rig_state *rs; ! char lvlbuf[BUFSZ],ackbuf[BUFSZ]; int lvl_len, ack_len, retval; *************** *** 552,556 **** int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) { ! unsigned char ackbuf[BUFSZ]; int ack_len, retval; --- 552,556 ---- int aor_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd) { ! char ackbuf[BUFSZ]; int ack_len, retval; *************** *** 611,615 **** { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! unsigned char membuf[BUFSZ]; int mem_len; int mem_num; --- 611,615 ---- { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! char membuf[BUFSZ]; int mem_len; int mem_num; *************** *** 643,647 **** struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; int mem_len, retval; ! unsigned char membuf[BUFSZ]; retval = aor_transaction (rig, "MR" EOM, 3, membuf, &mem_len); --- 643,647 ---- struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; int mem_len, retval; ! char membuf[BUFSZ]; retval = aor_transaction (rig, "MR" EOM, 3, membuf, &mem_len); *************** *** 674,678 **** { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! unsigned char membuf[BUFSZ]; int mem_len; --- 674,678 ---- { struct aor_priv_caps *priv = (struct aor_priv_caps*)rig->caps->priv; ! char membuf[BUFSZ]; int mem_len; *************** *** 714,717 **** --- 714,718 ---- int retval; char *tagp; + int ts; /* *************** *** 781,785 **** return -RIG_EPROTO; } ! sscanf(tagp+2,"%d", (int*)&chan->tuning_step); } --- 782,787 ---- return -RIG_EPROTO; } ! ts = chan->tuning_step; ! sscanf(tagp+2,"%d", &ts); } Index: ar3000.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/aor/ar3000.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** ar3000.c 10 Apr 2005 21:47:12 -0000 1.9 --- ar3000.c 7 Oct 2006 21:10:11 -0000 1.10 *************** *** 75,79 **** .model_name = "AR3000A", .mfg_name = "AOR", ! .version = "0.4", .copyright = "LGPL", .status = RIG_STATUS_BETA, --- 75,79 ---- .model_name = "AR3000A", .mfg_name = "AOR", ! .version = "0.5", .copyright = "LGPL", .status = RIG_STATUS_BETA, *************** *** 223,227 **** int ar3k_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { ! unsigned char freqbuf[BUFSZ]; int freq_len, retval; unsigned lowhz; --- 223,227 ---- int ar3k_set_freq(RIG *rig, vfo_t vfo, freq_t freq) { ! char freqbuf[BUFSZ]; int freq_len, retval; unsigned lowhz; *************** *** 258,262 **** char *rfp; int freq_len, retval; ! unsigned char freqbuf[BUFSZ]; /* --- 258,262 ---- char *rfp; int freq_len, retval; ! char freqbuf[BUFSZ]; /* *************** *** 283,287 **** int ar3k_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { ! unsigned char mdbuf[BUFSZ]; int mdbuf_len, aormode, retval; --- 283,287 ---- int ar3k_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { ! char mdbuf[BUFSZ]; int mdbuf_len, aormode, retval; *************** *** 313,317 **** char *rfp; int buf_len, retval; ! unsigned char buf[BUFSZ]; /* --- 313,317 ---- char *rfp; int buf_len, retval; ! char buf[BUFSZ]; /* *************** *** 351,355 **** int ar3k_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) { ! unsigned char freqbuf[BUFSZ]; int freq_len, retval; int lowhz; --- 351,355 ---- int ar3k_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts) { ! char freqbuf[BUFSZ]; int freq_len, retval; int lowhz; *************** *** 386,390 **** char *rfp; int freq_len, retval; ! unsigned char freqbuf[BUFSZ]; /* --- 386,390 ---- char *rfp; int freq_len, retval; ! char freqbuf[BUFSZ]; /* *************** *** 408,412 **** int ar3k_set_mem(RIG *rig, vfo_t vfo, int ch) { ! unsigned char cmdbuf[BUFSZ]; int cmd_len, retval; --- 408,412 ---- int ar3k_set_mem(RIG *rig, vfo_t vfo, int ch) { ! char cmdbuf[BUFSZ]; int cmd_len, retval; *************** *** 419,423 **** int ar3k_set_bank(RIG *rig, vfo_t vfo, int bank) { ! unsigned char cmdbuf[BUFSZ]; int cmd_len, retval; --- 419,423 ---- int ar3k_set_bank(RIG *rig, vfo_t vfo, int bank) { ! char cmdbuf[BUFSZ]; int cmd_len, retval; *************** *** 431,435 **** int ar3k_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { ! unsigned char *cmd; int retval; --- 431,435 ---- int ar3k_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { ! char *cmd; int retval; *************** *** 452,456 **** { int info_len, retval; ! unsigned char infobuf[BUFSZ]; switch(level) { --- 452,456 ---- { int info_len, retval; ! char infobuf[BUFSZ]; switch(level) { Index: ar3030.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/aor/ar3030.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** ar3030.c 10 Apr 2005 21:47:12 -0000 1.9 --- ar3030.c 7 Oct 2006 21:10:11 -0000 1.10 *************** *** 101,105 **** .model_name = "AR3030", .mfg_name = "AOR", ! .version = "0.3", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, --- 101,105 ---- .model_name = "AR3030", .mfg_name = "AOR", ! .version = "0.4", .copyright = "LGPL", .status = RIG_STATUS_UNTESTED, *************** *** 280,284 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char *cmd = ""; int retval; --- 280,284 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char *cmd = ""; int retval; *************** *** 316,320 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char freqbuf[BUFSZ]; int freq_len, retval; --- 316,320 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char freqbuf[BUFSZ]; int freq_len, retval; *************** *** 339,343 **** char *rfp; int freq_len, retval; ! unsigned char freqbuf[BUFSZ]; /* --- 339,343 ---- char *rfp; int freq_len, retval; ! char freqbuf[BUFSZ]; /* *************** *** 364,368 **** int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { ! unsigned char mdbuf[BUFSZ]; int mdbuf_len, aormode, retval; --- 364,368 ---- int ar3030_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) { ! char mdbuf[BUFSZ]; int mdbuf_len, aormode, retval; *************** *** 397,401 **** struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; int buf_len, retval; ! unsigned char buf[BUFSZ]; /* --- 397,401 ---- struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; int buf_len, retval; ! char buf[BUFSZ]; /* *************** *** 433,437 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char cmdbuf[BUFSZ]; int cmd_len, retval=RIG_OK; --- 433,437 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char cmdbuf[BUFSZ]; int cmd_len, retval=RIG_OK; *************** *** 451,455 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char infobuf[BUFSZ]; int info_len, retval; --- 451,455 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char infobuf[BUFSZ]; int info_len, retval; *************** *** 485,489 **** int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { ! unsigned char *cmd; int retval; --- 485,489 ---- int ar3030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { ! char *cmd; int retval; *************** *** 513,517 **** struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; int info_len, retval; ! unsigned char infobuf[BUFSZ], *p; switch(level) { --- 513,517 ---- struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; int info_len, retval; ! char infobuf[BUFSZ], *p; switch(level) { *************** *** 565,569 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char cmdbuf[BUFSZ], infobuf[BUFSZ]; int info_len, cmd_len, retval; --- 565,569 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char cmdbuf[BUFSZ], infobuf[BUFSZ]; int info_len, cmd_len, retval; *************** *** 624,628 **** { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! unsigned char buf[16]; int len, retval; --- 624,628 ---- { struct ar3030_priv_data *priv = (struct ar3030_priv_data *)rig->state.priv; ! char buf[16]; int len, retval; Index: ar7030.c =================================================================== RCS file: /cvsroot/hamlib/hamlib/aor/ar7030.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** ar7030.c 26 Feb 2006 19:21:53 -0000 1.6 --- ar7030.c 7 Oct 2006 21:10:11 -0000 1.7 *************** *** 75,79 **** static int rxr_writeByte(RIG *rig, unsigned char c) { ! return write_block(&rig->state.rigport, &c, 1); } --- 75,79 ---- static int rxr_writeByte(RIG *rig, unsigned char c) { ! return write_block(&rig->state.rigport, (char *) &c, 1); } *************** *** 84,89 **** unsigned char buf[] = {0x71}; // Read command int retval; ! retval = write_block(&rig->state.rigport, buf, 1); ! retval = read_block(&rig->state.rigport, response, 1); return response[0]; } --- 84,89 ---- unsigned char buf[] = {0x71}; // Read command int retval; ! retval = write_block(&rig->state.rigport, (char *) buf, 1); ! retval = read_block(&rig->state.rigport, (char *) response, 1); return response[0]; } *************** *** 165,168 **** --- 165,170 ---- // Routine 2 Set mode Setup from mode byte in memory and display mode, // select preferred filter and PBS, BFO values etc. + // currently not used + #if 0 static void Execute_Routine_2_1(RIG *rig, char mp , char ad , int numSteps) { *************** *** 174,177 **** --- 176,180 ---- unlock(rig); //Set UnLock Level } + #endif // Routine 3 Set passband Setup all IF parameters from filter, pbsval and bfoval bytes. static void Execute_Routine_3_1(RIG *rig, char mp , char ad , int numSteps) *************** *** 224,227 **** --- 227,232 ---- // Routine 5 Set audio Setup audio controller from memory register values. + // currently not used + #if 0 static void Execute_Routine_5_1(RIG *rig, char mp , char ad , int numSteps) { *************** *** 233,236 **** --- 238,243 ---- unlock(rig); //Set UnLock Level } + #endif + // Routine 6 Set RF-IF Setup RF Gain, IF Gain and AGC speed. Also sets Notch Filter and // Noise Blanker if these options are fitted. *************** *** 252,257 **** unsigned char buf[] = {0x2e}; // Read command int retval; ! retval = write_block(&rig->state.rigport, buf, 1); ! retval = read_block(&rig->state.rigport, response, 1); return response[0]; } --- 259,264 ---- unsigned char buf[] = {0x2e}; // Read command int retval; ! retval = write_block(&rig->state.rigport, (char *) buf, 1); ! retval = read_block(&rig->state.rigport, (char *) response, 1); return response[0]; } *************** *** 618,626 **** else if (smval1 < 11) { ! val->i = round((smval1 * 6 + smval2) * 10 / 12) - 118; } else if (smval1 >= 11) { ! val->i = round((smval1 * 6 + smval2) * 10 / 6) - 173; } return RIG_OK; --- 625,637 ---- else if (smval1 < 11) { ! /* int ops => int result => round has no effect (besides compiler warning */ ! //val->i = round((smval1 * 6 + smval2) * 10 / 12) - 118; ! val->i = ((smval1 * 6 + smval2) * 10 / 12) - 118; } else if (smval1 >= 11) { ! /* int ops => int result => round has no effect (besides compiler warning */ ! //val->i = round((smval1 * 6 + smval2) * 10 / 6) - 173; ! val->i = ((smval1 * 6 + smval2) * 10 / 6) - 173; } return RIG_OK; *************** *** 637,650 **** // 2 > RIG_POWER_STANDBY Standby switch (status) { ! case RIG_POWER_OFF: ! // Operate button 9 = Power button ! Execute_Operate_button(rig, 9); ! return RIG_OK; ! case RIG_POWER_ON: ! // Operate button 0 = None pressed ! Execute_Operate_button(rig, 0); ! return RIG_OK; ! } ! return -RIG_EINVAL; } --- 648,667 ---- // 2 > RIG_POWER_STANDBY Standby switch (status) { ! ! case RIG_POWER_OFF: ! // Operate button 9 = Power button ! Execute_Operate_button(rig, 9); ! return RIG_OK; ! ! case RIG_POWER_ON: ! // Operate button 0 = None pressed ! Execute_Operate_button(rig, 0); ! return RIG_OK; ! ! default: ! break; ! } ! ! return -RIG_EINVAL; } *************** *** 666,676 **** // 3 > RIG_RESET_MCALL Memory clear // 4 > RIG_RESET_MASTER Master reset ! switch(reset) ! { // Routine 0 Reset Setup receiver as at switch-on. ! case RIG_RESET_SOFT : ! Execute_Routine_0(rig) ; ! return RIG_OK; } return -RIG_EINVAL; } --- 683,697 ---- // 3 > RIG_RESET_MCALL Memory clear // 4 > RIG_RESET_MASTER Master reset ! switch(reset) { ! // Routine 0 Reset Setup receiver as at switch-on. ! case RIG_RESET_SOFT : ! Execute_Routine_0(rig) ; ! return RIG_OK; ! ! default: ! break; } + return -RIG_EINVAL; } *************** *** 691,695 **** .model_name = "AR7030", .mfg_name = "AOR", ! .version = "0.3.1", .copyright = "LGPL", .status = RIG_STATUS_BETA, --- 712,716 ---- .model_name = "AR7030", .mfg_name = "AOR", ! .version = "0.4", .copyright = "LGPL", .status = RIG_STATUS_BETA, |