On Tue, Nov 1, 2011 at 3:30 PM, <[email protected]> wrote:
> This is an automated email from Gerrit.
>
> ?yvind Harboe ([email protected]) just uploaded a new patch set to
> Gerrit, which you can find at http://openocd.zylin.com/156
>
> -- gerrit
>
> commit 09b17046aaca462496d634508567e3a543719c17
> Author: Øyvind Harboe <[email protected]>
> Date: Tue Nov 1 23:28:10 2011 +0100
>
> dsp5680xx: add missing and broken error propagation
>
> found by clang.
>
> Change-Id: Ie7e2ecad71bf0838ece93727e4778ad368b890ef
> Signed-off-by: Øyvind Harboe <[email protected]>
>
> diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c
> index 116f609..bf406c7 100644
> --- a/src/target/dsp5680xx.c
> +++ b/src/target/dsp5680xx.c
> @@ -538,7 +538,7 @@ static int eonce_enter_debug_mode_without_reset(struct
> target * target, uint16_t
> }
> if(eonce_status!=NULL)
> *eonce_status = data_read_from_dr;
> - return ERROR_OK;
> + return retval;
> }
the code will never reach that point if retval!=ERROR_OK, but i agree
it's good to apply this change, for clarity.
>
> #define TIME_DIV_FREESCALE 0.3
> @@ -606,6 +606,7 @@ static int eonce_enter_debug_mode(struct target * target,
> uint16_t * eonce_statu
> err_check_propagate(retval);
> instr_16 = 0x1;
> retval = dsp5680xx_drscan(target,(uint8_t *) & instr_16,(uint8_t *) &
> read_16,8);
> + err_check_propagate(retval);
> instr_16 = 0x20;
> retval = dsp5680xx_drscan(target,(uint8_t *) & instr_16,(uint8_t *) &
> read_16,8);
> jtag_add_sleep(TIME_DIV_FREESCALE*100*1000);
> @@ -1446,7 +1447,7 @@ int dsp5680xx_f_erase(struct target * target, int
> first, int last){
> if(do_mass_erase){
> //Mass erase
> retval = mass_erase(target,&hfm_ustat);
> - err_check_propagate(retval);
> + err_check_propagate(retval);
is this just a whitespace?
> last = HFM_SECTOR_COUNT-1;
> }else{
> for(int i = first;i<=last;i++){
> @@ -1704,8 +1705,10 @@ int dsp5680xx_f_unlock(struct target * target){
> err_check_propagate(retval);
> instr_16 = 0x1;
> retval = dsp5680xx_drscan(target,(uint8_t *) & instr_16,(uint8_t *) &
> read_16,8);
> + err_check_propagate(retval);
> instr_16 = 0x20;
> retval = dsp5680xx_drscan(target,(uint8_t *) & instr_16,(uint8_t *) &
> read_16,8);
> + err_check_propagate(retval);
> jtag_add_sleep(TIME_DIV_FREESCALE*100*1000);
> jtag_add_reset(0,0);
> jtag_add_sleep(TIME_DIV_FREESCALE*300*1000);
>
> --
>
> _______________________________________________
> Openocd-development mailing list
> [email protected]
> https://lists.berlios.de/mailman/listinfo/openocd-development
>
>
this patch seems fine, doesn't affect normal operation.
--
Rodrigo.
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
