Changeset 1448


Ignore:
Timestamp:
09/18/11 02:41:33 (8 months ago)
Author:
stefanct
Message:

Unsignify lengths and addresses in chip functions and structs

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/82802ab.c

    r1420 r1448  
    142142 
    143143/* chunksize is 1 */ 
    144 int write_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) 
     144int write_82802ab(struct flashchip *flash, uint8_t *src, unsigned int start, unsigned int len) 
    145145{ 
    146146        int i; 

  • trunk/chipdrivers.h

    r1420 r1448  
    4242int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen); 
    4343int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); 
    44 int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len); 
    45 int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); 
    46 int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); 
     44int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     45int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     46int spi_chip_read(struct flashchip *flash, uint8_t *buf, unsigned int start, int unsigned len); 
    4747uint8_t spi_read_status_register(void); 
    4848int spi_write_status_register(struct flashchip *flash, int status); 
    … …  
    5252int spi_prettyprint_status_register(struct flashchip *flash); 
    5353int spi_disable_blockprotect(struct flashchip *flash); 
    54 int spi_byte_program(int addr, uint8_t databyte); 
    55 int spi_nbyte_program(int addr, uint8_t *bytes, int len); 
    56 int spi_nbyte_read(int addr, uint8_t *bytes, int len); 
    57 int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); 
    58 int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); 
    59 int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len); 
     54int spi_byte_program(unsigned int addr, uint8_t databyte); 
     55int spi_nbyte_program(unsigned int addr, uint8_t *bytes, unsigned int len); 
     56int spi_nbyte_read(unsigned int addr, uint8_t *bytes, unsigned int len); 
     57int spi_read_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); 
     58int spi_write_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); 
     59int spi_aai_write(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    6060 
    6161/* a25.c */ 
    … …  
    8282int probe_82802ab(struct flashchip *flash); 
    8383int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); 
    84 int write_82802ab(struct flashchip *flash, uint8_t *buf, int start, int len); 
     84int write_82802ab(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    8585void print_status_82802ab(uint8_t status); 
    8686int unlock_82802ab(struct flashchip *flash); 
    … …  
    9595                             chipaddr dst); 
    9696int probe_jedec(struct flashchip *flash); 
    97 int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len); 
    98 int write_jedec_1(struct flashchip *flash, uint8_t *buf, int start, int len); 
     97int write_jedec(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     98int write_jedec_1(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    9999int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); 
    100100int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); 
    … …  
    105105int block_erase_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); 
    106106int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); 
    107 int write_m29f400bt(struct flashchip *flash, uint8_t *buf, int start, int len); 
     107int write_m29f400bt(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    108108void protect_m29f400bt(chipaddr bios); 
    109109 
    … …  
    115115int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); 
    116116int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); 
    117 int write_28sf040(struct flashchip *flash, uint8_t *buf, int start, int len); 
     117int write_28sf040(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    118118int unprotect_28sf040(struct flashchip *flash); 
    119119int protect_28sf040(struct flashchip *flash); 

  • trunk/dummyflasher.c

    r1397 r1448  
    6464                      const unsigned char *writearr, unsigned char *readarr); 
    6565static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    66                                int start, int len); 
     66                               unsigned int start, unsigned int len); 
    6767 
    6868static const struct spi_programmer spi_programmer_dummyflasher = { 
    … …  
    529529 
    530530static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    531                                int start, int len) 
     531                               unsigned int start, unsigned int len) 
    532532{ 
    533533        return spi_write_chunked(flash, buf, start, len, 

  • trunk/flash.h

    r1426 r1448  
    109109 
    110110        /* Total chip size in kilobytes */ 
    111         int total_size; 
     111        unsigned int total_size; 
    112112        /* Chip page size in bytes */ 
    113         int page_size; 
     113        unsigned int page_size; 
    114114        int feature_bits; 
    115115 
    … …  
    123123 
    124124        /* Delay after "enter/exit ID mode" commands in microseconds. */ 
    125         int probe_timing; 
     125        unsigned int probe_timing; 
    126126 
    127127        /* 
    … …  
    144144        int (*printlock) (struct flashchip *flash); 
    145145        int (*unlock) (struct flashchip *flash); 
    146         int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len); 
    147         int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); 
     146        int (*write) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     147        int (*read) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    148148        struct { 
    149149                uint16_t min; 
    … …  
    203203extern char *chip_to_probe; 
    204204void map_flash_registers(struct flashchip *flash); 
    205 int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); 
     205int read_memmapped(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    206206int erase_flash(struct flashchip *flash); 
    207207int probe_flash(int startchip, struct flashchip *fill_flash, int force); 
    … …  
    211211void tolower_string(char *str); 
    212212char *extract_param(char **haystack, const char *needle, const char *delim); 
    213 int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message); 
     213int verify_range(struct flashchip *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, const char *message); 
    214214int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); 
    215215char *strcat_realloc(char *dest, const char *src); 

  • trunk/flashrom.c

    r1433 r1448  
    565565} 
    566566 
    567 int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len) 
     567int read_memmapped(struct flashchip *flash, uint8_t *buf, unsigned int start, int unsigned len) 
    568568{ 
    569569        chip_readn(buf, flash->virtual_memory + start, len); 
    … …  
    711711 * @return      0 for success, -1 for failure 
    712712 */ 
    713 int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, 
     713int verify_range(struct flashchip *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, 
    714714                 const char *message) 
    715715{ 

  • trunk/it87spi.c

    r1433 r1448  
    107107                        const unsigned char *writearr, unsigned char *readarr); 
    108108static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, 
    109                                  int start, int len); 
     109                                 unsigned int start, unsigned int len); 
    110110static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, 
    111                                       int start, int len); 
     111                                      unsigned int start, unsigned int len); 
    112112 
    113113static const struct spi_programmer spi_programmer_it87xx = { 
    … …  
    341341 */ 
    342342static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, 
    343                                  int start, int len) 
     343                                 unsigned int start, unsigned int len) 
    344344{ 
    345345        fast_spi = 0; 
    … …  
    359359 
    360360static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, 
    361                                       int start, int len) 
     361                                      unsigned int start, unsigned int len) 
    362362{ 
    363363        /* 

  • trunk/jedec.c

    r1414 r1448  
    356356 
    357357/* chunksize is 1 */ 
    358 int write_jedec_1(struct flashchip *flash, uint8_t *src, int start, int len) 
     358int write_jedec_1(struct flashchip *flash, uint8_t *src, unsigned int start, unsigned int len) 
    359359{ 
    360360        int i, failed = 0; 
    … …  
    377377} 
    378378 
    379 int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size) 
     379int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, unsigned int start, unsigned int page_size) 
    380380{ 
    381381        int i, tried = 0, failed; 
    … …  
    425425 * Each page is written separately in chunks with a maximum size of chunksize. 
    426426 */ 
    427 int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len) 
     427int write_jedec(struct flashchip *flash, uint8_t *buf, unsigned int start, int unsigned len) 
    428428{ 
    429429        int i, starthere, lenhere; 

  • trunk/m29f400bt.c

    r1353 r1448  
    2929 
    3030/* chunksize is 1 */ 
    31 int write_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len) 
     31int write_m29f400bt(struct flashchip *flash, uint8_t *src, unsigned int start, unsigned int len) 
    3232{ 
    3333        int i; 

  • trunk/programmer.h

    r1442 r1448  
    557557struct spi_programmer { 
    558558        enum spi_controller type; 
    559         int max_data_read; 
    560         int max_data_write; 
     559        unsigned int max_data_read; 
     560        unsigned int max_data_write; 
    561561        int (*command)(unsigned int writecnt, unsigned int readcnt, 
    562562                   const unsigned char *writearr, unsigned char *readarr); 
    … …  
    564564 
    565565        /* Optimized functions for this programmer */ 
    566         int (*read)(struct flashchip *flash, uint8_t *buf, int start, int len); 
    567         int (*write_256)(struct flashchip *flash, uint8_t *buf, int start, int len); 
     566        int (*read)(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     567        int (*write_256)(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    568568}; 
    569569 
    … …  
    572572                             const unsigned char *writearr, unsigned char *readarr); 
    573573int default_spi_send_multicommand(struct spi_command *cmds); 
    574 int default_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); 
    575 int default_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); 
     574int default_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     575int default_spi_write_256(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    576576void register_spi_programmer(const struct spi_programmer *programmer); 
    577577 
    … …  
    611611int serprog_spi_send_command(unsigned int writecnt, unsigned int readcnt, 
    612612                        const unsigned char *writearr, unsigned char *readarr); 
    613 int serprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); 
     613int serprog_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    614614#endif 
    615615 

  • trunk/serprog.c

    r1442 r1448  
    796796 * non-contiguous address space (like AT45DB161D). When spi_read_chunked is 
    797797 * fixed this method can be removed. */ 
    798 int serprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) 
     798int serprog_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    799799{ 
    800800        int i; 

  • trunk/spi.c

    r1396 r1448  
    9898} 
    9999 
    100 int default_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) 
     100int default_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    101101{ 
    102         int max_data = spi_programmer->max_data_read; 
     102        unsigned int max_data = spi_programmer->max_data_read; 
    103103        if (max_data == MAX_DATA_UNSPECIFIED) { 
    104104                msg_perr("%s called, but SPI read chunk size not defined " 
    … …  
    110110} 
    111111 
    112 int default_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) 
     112int default_spi_write_256(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    113113{ 
    114         int max_data = spi_programmer->max_data_write; 
     114        unsigned int max_data = spi_programmer->max_data_write; 
    115115        if (max_data == MAX_DATA_UNSPECIFIED) { 
    116116                msg_perr("%s called, but SPI write chunk size not defined " 
    … …  
    122122} 
    123123 
    124 int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len) 
     124int spi_chip_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    125125{ 
    126126        int addrbase = 0; 
    … …  
    161161 */ 
    162162/* real chunksize is up to 256, logical chunksize is 256 */ 
    163 int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) 
     163int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    164164{ 
    165165        if (!spi_programmer->write_256) { 

  • trunk/spi25.c

    r1367 r1448  
    845845} 
    846846 
    847 int spi_byte_program(int addr, uint8_t databyte) 
     847int spi_byte_program(unsigned int addr, uint8_t databyte) 
    848848{ 
    849849        int result; 
    … …  
    880880} 
    881881 
    882 int spi_nbyte_program(int addr, uint8_t *bytes, int len) 
     882int spi_nbyte_program(unsigned int addr, uint8_t *bytes, unsigned int len) 
    883883{ 
    884884        int result; 
    … …  
    955955} 
    956956 
    957 int spi_nbyte_read(int address, uint8_t *bytes, int len) 
     957int spi_nbyte_read(unsigned int address, uint8_t *bytes, unsigned int len) 
    958958{ 
    959959        const unsigned char cmd[JEDEC_READ_OUTSIZE] = { 
    … …  
    973973 * Each page is read separately in chunks with a maximum size of chunksize. 
    974974 */ 
    975 int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) 
     975int spi_read_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) 
    976976{ 
    977977        int rc = 0; 
    … …  
    10131013 * Each page is written separately in chunks with a maximum size of chunksize. 
    10141014 */ 
    1015 int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) 
     1015int spi_write_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) 
    10161016{ 
    10171017        int rc = 0; 
    … …  
    10621062 */ 
    10631063/* real chunksize is 1, logical chunksize is 1 */ 
    1064 int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len) 
     1064int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    10651065{ 
    10661066        int i, result = 0; 
    … …  
    10771077} 
    10781078 
    1079 int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len) 
     1079int spi_aai_write(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    10801080{ 
    10811081        uint32_t pos = start; 

  • trunk/sst28sf040.c

    r1353 r1448  
    7777 
    7878/* chunksize is 1 */ 
    79 int write_28sf040(struct flashchip *flash, uint8_t *src, int start, int len) 
     79int write_28sf040(struct flashchip *flash, uint8_t *src, unsigned int start, unsigned int len) 
    8080{ 
    8181        int i; 

  • trunk/wbsio_spi.c

    r1317 r1448  
    6363static int wbsio_spi_send_command(unsigned int writecnt, unsigned int readcnt, 
    6464                      const unsigned char *writearr, unsigned char *readarr); 
    65 static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); 
     65static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    6666 
    6767static const struct spi_programmer spi_programmer_wbsio = { 
    … …  
    195195} 
    196196 
    197 static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) 
     197static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    198198{ 
    199199        return read_memmapped(flash, buf, start, len); 
Note: See TracChangeset for help on using the changeset viewer.