Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a2199afea169c1e13881ca90a02a28e4c9ffd114

Authored by Heiko Schocher
Committed by Marek Vasut
1 parent 2c072c958b
Exists in v2017.01-smarct4x and in 48 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

usb, dfu: extract flush code into seperate function 

move the flushing code into an extra function dfu_flush(),
so it can be used from other code.

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>

Showing 2 changed files with 25 additions and 18 deletions Side-by-side Diff

... ... @@ -126,6 +126,28 @@
126 126 return ret;
127 127 }
128 128  
  129 +int dfu_flush(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)
  130 +{
  131 + int ret = 0;
  132 +
  133 + if (dfu->flush_medium)
  134 + ret = dfu->flush_medium(dfu);
  135 +
  136 + printf("\nDFU complete CRC32: 0x%08x\n", dfu->crc);
  137 +
  138 + /* clear everything */
  139 + dfu_free_buf();
  140 + dfu->crc = 0;
  141 + dfu->offset = 0;
  142 + dfu->i_blk_seq_num = 0;
  143 + dfu->i_buf_start = dfu_buf;
  144 + dfu->i_buf_end = dfu_buf;
  145 + dfu->i_buf = dfu->i_buf_start;
  146 + dfu->inited = 0;
  147 +
  148 + return ret;
  149 +}
  150 +
129 151 int dfu_write(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num)
130 152 {
131 153 int ret = 0;
... ... @@ -197,24 +219,8 @@
197 219 }
198 220  
199 221 /* end? */
200   - if (size == 0) {
201   - /* Now try and flush to the medium if needed. */
202   - if (dfu->flush_medium)
203   - ret = dfu->flush_medium(dfu);
204   - printf("\nDFU complete CRC32: 0x%08x\n", dfu->crc);
205   -
206   - /* clear everything */
207   - dfu_free_buf();
208   - dfu->crc = 0;
209   - dfu->offset = 0;
210   - dfu->i_blk_seq_num = 0;
211   - dfu->i_buf_start = dfu_buf;
212   - dfu->i_buf_end = dfu_buf;
213   - dfu->i_buf = dfu->i_buf_start;
214   -
215   - dfu->inited = 0;
216   -
217   - }
  222 + if (size == 0)
  223 + ret = dfu_flush(dfu, buf, size, blk_seq_num);
218 224  
219 225 return ret = 0 ? size : ret;
220 226 }
... ... @@ -138,6 +138,7 @@
138 138  
139 139 int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
140 140 int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
  141 +int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
141 142 /* Device specific */
142 143 #ifdef CONFIG_DFU_MMC
143 144 extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s);