[S] Change in flashrom[master]: flash.h: Make functions global that will be used for new erase algorithm

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/71174 )

Change subject: flash.h: Make functions global that will be used for new erase algorithm
......................................................................

flash.h: Make functions global that will be used for new erase algorithm

The new erase algorithm uses some of the functions which are static to
`flashrom.c`. So make these functions global and add prototypes to
`include\flash.h` and `include\layout.h'.

Change-Id: I7ee7e208948337b88467935fd2861b5f9ad6af9d
Signed-off-by: Aarya Chaumal 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/71174
Tested-by: build bot (Jenkins) 
Reviewed-by: Anastasia Klimchuk 
---
M flashrom.c
M include/flash.h
M include/layout.h
3 files changed, 35 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/flashrom.c b/flashrom.c
index 8da2c42..957d4aa 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -356,7 +356,7 @@
    return extract_param(&cfg->params, param_name, ",");
 }

-static void get_flash_region(const struct flashctx *flash, int addr, struct flash_region *region)
+void get_flash_region(const struct flashctx *flash, int addr, struct flash_region *region)
 {
    if ((flash->mst->buses_supported & BUS_PROG) && flash->mst->opaque.get_region) {
    	flash->mst->opaque.get_region(flash, addr, region);
@@ -371,7 +371,7 @@
    }
 }

-static int check_for_unwritable_regions(const struct flashctx *flash, unsigned int start, unsigned int len)
+int check_for_unwritable_regions(const struct flashctx *flash, unsigned int start, unsigned int len)
 {
    struct flash_region region;
    for (unsigned int addr = start; addr < start + len; addr = region.end) {
@@ -391,7 +391,7 @@
 /* special unit-test hook */
 erasefunc_t *g_test_erase_injector;

-static erasefunc_t *lookup_erase_func_ptr(const struct block_eraser *const eraser)
+erasefunc_t *lookup_erase_func_ptr(const struct block_eraser *const eraser)
 {
    switch (eraser->block_erase) {
    	case SPI_BLOCK_ERASE_EMULATION: return &spi_block_erase_emulation;
@@ -439,7 +439,7 @@
    return NULL;
 }

-static int check_block_eraser(const struct flashctx *flash, int k, int log)
+int check_block_eraser(const struct flashctx *flash, int k, int log)
 {
    struct block_eraser eraser = flash->chip->block_erasers[k];

@@ -477,7 +477,7 @@
 }

/* Returns the number of well-defined erasers for a chip. */
-static unsigned int count_usable_erasers(const struct flashctx *flash)
+unsigned int count_usable_erasers(const struct flashctx *flash)
 {
    unsigned int usable_erasefunctions = 0;
    int k;
@@ -509,7 +509,7 @@
 }

/* start is an offset to the base address of the flash chip */
-static int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len)
+int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len)
 {
    int ret;
    const uint8_t erased_value = ERASED_VALUE(flash);
@@ -710,7 +710,7 @@
  * @gran	write granularity (enum, not count)
  * @return      0 if no erase is needed, 1 otherwise
  */
-static int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len,
+int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len,
                enum write_granularity gran, const uint8_t erased_value)
 {
    int result = 0;
@@ -786,7 +786,7 @@
  * in relation to the max write length of the programmer and the max write
  * length of the chip.
  */
-static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, unsigned int len,
+unsigned int get_next_write(const uint8_t *have, const uint8_t *want, unsigned int len,
    		  unsigned int *first_start,
    		  enum write_granularity gran)
 {
@@ -993,7 +993,7 @@
  * This wrapper simplifies most cases when the flash chip needs to be written
  * since policy decisions such as non-fatal error handling is centralized.
  */
-static int write_flash(struct flashctx *flash, const uint8_t *buf,
+int write_flash(struct flashctx *flash, const uint8_t *buf,
    	       unsigned int start, unsigned int len)
 {
    if (!flash->flags.skip_unwritable_regions) {
diff --git a/include/flash.h b/include/flash.h
index 2ea9c86..fcefc42 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -619,6 +619,13 @@
 int prepare_flash_access(struct flashctx *, bool read_it, bool write_it, bool erase_it, bool verify_it);
 void finalize_flash_access(struct flashctx *);
 int register_chip_restore(chip_restore_fn_cb_t func, struct flashctx *flash, uint8_t status);
+int check_block_eraser(const struct flashctx *flash, int k, int log);
+unsigned int count_usable_erasers(const struct flashctx *flash);
+int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran, const uint8_t erased_value);
+erasefunc_t *lookup_erase_func_ptr(const struct block_eraser *const eraser);
+int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len);
+unsigned int get_next_write(const uint8_t *have, const uint8_t *want, unsigned int len, unsigned int *first_start, enum write_granularity gran);
+int write_flash(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);

/* Something happened that shouldn't happen, but we can go on. */
 #define ERROR_FLASHROM_NONFATAL 0x100
diff --git a/include/layout.h b/include/layout.h
index 70d99cb..5614bea 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -72,5 +72,7 @@
 int included_regions_overlap(const struct flashrom_layout *);
 void prepare_layout_for_extraction(struct flashrom_flashctx *);
 int layout_sanity_checks(const struct flashrom_flashctx *);
+int check_for_unwritable_regions(const struct flashrom_flashctx *flash, unsigned int start, unsigned int len);
+void get_flash_region(const struct flashrom_flashctx *flash, int addr, struct flash_region *region);

#endif /* !__LAYOUT_H__ */