flash/nor: Use proper data types in driver API

[fw/openocd] / src / flash / nor / core.h

diff --git a/src/flash/nor/core.h b/src/flash/nor/core.h
index ff5cb60c421a301fcf6183ede85140134ab73379..9f897e3e217cd66882e5ba25e3b459bc86d313b7 100644 (file)
--- a/src/flash/nor/core.h
+++ b/src/flash/nor/core.h
@@ -93,12 +93,12 @@ struct flash_bank {
        const struct flash_driver *driver; /**< Driver for this bank. */
        void *driver_priv; /**< Private driver storage pointer */
 
-       int bank_number; /**< The 'bank' (or chip number) of this instance. */
+       unsigned int bank_number; /**< The 'bank' (or chip number) of this instance. */
        target_addr_t base; /**< The base address of this bank */
        uint32_t size; /**< The size of this chip bank, in bytes */
 
-       int chip_width; /**< Width of the chip in bytes (1,2,4 bytes) */
-       int bus_width; /**< Maximum bus width, in bytes (1,2,4 bytes) */
+       unsigned int chip_width; /**< Width of the chip in bytes (1,2,4 bytes) */
+       unsigned int bus_width; /**< Maximum bus width, in bytes (1,2,4 bytes) */
 
        /** Erased value. Defaults to 0xFF. */
        uint8_t erased_value;
@@ -124,7 +124,7 @@ struct flash_bank {
         * be set initially to 0, and the flash driver must set this to
         * some non-zero value during "probe()" or "auto_probe()".
         */
-       int num_sectors;
+       unsigned int num_sectors;
        /** Array of sectors, allocated and initialized by the flash driver */
        struct flash_sector *sectors;
 
@@ -134,7 +134,7 @@ struct flash_bank {
         * Driver probe can set protection blocks array to work with
         * protection granularity different than sector size.
         */
-       int num_prot_blocks;
+       unsigned int num_prot_blocks;
        /** Array of protection blocks, allocated and initialized by the flash driver */
        struct flash_sector *prot_blocks;
 
@@ -179,12 +179,12 @@ target_addr_t flash_write_align_end(struct flash_bank *bank, target_addr_t addr)
  * @param target The target with the flash to be programmed.
  * @param image The image that will be programmed to flash.
  * @param written On return, contains the number of bytes written.
- * @param erase If non-zero, indicates the flash driver should first
+ * @param erase Indicates whether the flash driver should first
  * erase the corresponding banks or sectors before programming.
  * @returns ERROR_OK if successful; otherwise, an error code.
  */
 int flash_write(struct target *target,
-               struct image *image, uint32_t *written, int erase);
+               struct image *image, uint32_t *written, bool erase);
 
 /**
  * Forces targets to re-examine their erase/protection state.
@@ -193,7 +193,7 @@ int flash_write(struct target *target,
 void flash_set_dirty(void);
 
 /** @returns The number of flash banks currently defined. */
-int flash_get_bank_count(void);
+unsigned int flash_get_bank_count(void);
 
 /** Deallocates bank->driver_priv */
 void default_flash_free_driver_priv(struct flash_bank *bank);
@@ -240,7 +240,7 @@ struct flash_bank *get_flash_bank_by_name_noprobe(const char *name);
  * @param bank returned bank if fn returns ERROR_OK
  * @returns ERROR_OK if successful
  */
-int get_flash_bank_by_num(int num, struct flash_bank **bank);
+int get_flash_bank_by_num(unsigned int num, struct flash_bank **bank);
 /**
  * Retrieves @a bank from a command argument, reporting errors parsing
  * the bank identifier or retrieving the specified bank.  The bank
@@ -258,7 +258,7 @@ COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
  * @param num The flash bank number.
  * @returns A struct flash_bank for flash bank @a num, or NULL.
  */
-struct flash_bank *get_flash_bank_by_num_noprobe(int num);
+struct flash_bank *get_flash_bank_by_num_noprobe(unsigned int num);
 /**
  * Returns the flash bank located at a specified address.
  * @param target The target, presumed to contain one or more banks.
@@ -275,6 +275,7 @@ int get_flash_bank_by_addr(struct target *target, target_addr_t addr, bool check
  * @param num_blocks Number of blocks in array.
  * @returns A struct flash_sector pointer or NULL when allocation failed.
  */
-struct flash_sector *alloc_block_array(uint32_t offset, uint32_t size, int num_blocks);
+struct flash_sector *alloc_block_array(uint32_t offset, uint32_t size,
+               unsigned int num_blocks);
 
 #endif /* OPENOCD_FLASH_NOR_CORE_H */