Changeset 1470


Ignore:
Timestamp:
11/23/11 10:13:48 (6 months ago)
Author:
stefanct
Message:

Unsignify lengths and addresses in chip functions and structs

Push those changes forward where needed to prevent new sign
conversion warnings where possible.

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

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/82802ab.c

    r1450 r1470  
    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/buspirate_spi.c

    r1414 r1470  
    296296{ 
    297297        static unsigned char *buf = NULL; 
    298         int i = 0, ret = 0; 
     298        unsigned int i = 0; 
     299        int ret = 0; 
    299300 
    300301        if (writecnt > 16 || readcnt > 16 || (readcnt + writecnt) > 16) 

  • trunk/chipdrivers.h

    r1459 r1470  
    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/* opaque.c */ 
    6262int probe_opaque(struct flashchip *flash); 
    63 int read_opaque(struct flashchip *flash, uint8_t *buf, int start, int len); 
    64 int write_opaque(struct flashchip *flash, uint8_t *buf, int start, int len); 
     63int read_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     64int write_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    6565int erase_opaque(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); 
    6666 
    … …  
    8888int probe_82802ab(struct flashchip *flash); 
    8989int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); 
    90 int write_82802ab(struct flashchip *flash, uint8_t *buf, int start, int len); 
     90int write_82802ab(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    9191void print_status_82802ab(uint8_t status); 
    9292int unlock_82802ab(struct flashchip *flash); 
    … …  
    101101                             chipaddr dst); 
    102102int probe_jedec(struct flashchip *flash); 
    103 int write_jedec(struct flashchip *flash, uint8_t *buf, int start, int len); 
    104 int write_jedec_1(struct flashchip *flash, uint8_t *buf, int start, int len); 
     103int write_jedec(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     104int write_jedec_1(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    105105int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); 
    106106int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); 
    … …  
    111111int block_erase_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); 
    112112int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); 
    113 int write_m29f400bt(struct flashchip *flash, uint8_t *buf, int start, int len); 
     113int write_m29f400bt(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    114114void protect_m29f400bt(chipaddr bios); 
    115115 
    … …  
    121121int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); 
    122122int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); 
    123 int write_28sf040(struct flashchip *flash, uint8_t *buf, int start, int len); 
     123int write_28sf040(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    124124int unprotect_28sf040(struct flashchip *flash); 
    125125int protect_28sf040(struct flashchip *flash); 

  • trunk/dediprog.c

    r1413 r1470  
    207207 */ 
    208208static int dediprog_spi_bulk_read(struct flashchip *flash, uint8_t *buf, 
    209                                   int start, int len) 
    210 { 
    211         int ret; 
    212         int i; 
     209                                  unsigned int start, unsigned int len) 
     210{ 
     211        int ret; 
     212        unsigned int i; 
    213213        /* chunksize must be 512, other sizes will NOT work at all. */ 
    214         const int chunksize = 0x200; 
    215         const int count = len / chunksize; 
     214        const unsigned int chunksize = 0x200; 
     215        const unsigned int count = len / chunksize; 
    216216        const char count_and_chunk[] = {count & 0xff, 
    217217                                        (count >> 8) & 0xff, 
    … …  
    254254} 
    255255 
    256 static int dediprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, 
    257                              int len) 
     256static int dediprog_spi_read(struct flashchip *flash, uint8_t *buf, 
     257                             unsigned int start, unsigned int len) 
    258258{ 
    259259        int ret; 
    260260        /* chunksize must be 512, other sizes will NOT work at all. */ 
    261         const int chunksize = 0x200; 
    262         int residue = start % chunksize ? chunksize - start % chunksize : 0; 
    263         int bulklen; 
     261        const unsigned int chunksize = 0x200; 
     262        unsigned int residue = start % chunksize ? chunksize - start % chunksize : 0; 
     263        unsigned int bulklen; 
    264264 
    265265        dediprog_set_leds(PASS_OFF|BUSY_ON|ERROR_OFF); 
    … …  
    301301 
    302302static int dediprog_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    303                                   int start, int len) 
     303                                  unsigned int start, unsigned int len) 
    304304{ 
    305305        int ret; 

  • trunk/dummyflasher.c

    r1463 r1470  
    4747static enum emu_chip emu_chip = EMULATE_NONE; 
    4848static char *emu_persistent_image = NULL; 
    49 static int emu_chip_size = 0; 
     49static unsigned int emu_chip_size = 0; 
    5050#if EMULATE_SPI_CHIP 
    51 static int emu_max_byteprogram_size = 0; 
    52 static int emu_max_aai_size = 0; 
    53 static int emu_jedec_se_size = 0; 
    54 static int emu_jedec_be_52_size = 0; 
    55 static int emu_jedec_be_d8_size = 0; 
    56 static int emu_jedec_ce_60_size = 0; 
    57 static int emu_jedec_ce_c7_size = 0; 
    58 #endif 
    59 #endif 
    60  
    61 static int spi_write_256_chunksize = 256; 
     51static unsigned int emu_max_byteprogram_size = 0; 
     52static unsigned int emu_max_aai_size = 0; 
     53static unsigned int emu_jedec_se_size = 0; 
     54static unsigned int emu_jedec_be_52_size = 0; 
     55static unsigned int emu_jedec_be_d8_size = 0; 
     56static unsigned int emu_jedec_ce_60_size = 0; 
     57static unsigned int emu_jedec_ce_c7_size = 0; 
     58#endif 
     59#endif 
     60 
     61static unsigned int spi_write_256_chunksize = 256; 
    6262 
    6363static int dummy_spi_send_command(unsigned int writecnt, unsigned int readcnt, 
    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 = { 
    … …  
    321321                      const unsigned char *writearr, unsigned char *readarr) 
    322322{ 
    323         int offs; 
    324         static int aai_offs; 
     323        unsigned int offs; 
     324        static int unsigned aai_offs; 
    325325        static int aai_active = 0; 
    326326 
    … …  
    550550 
    551551static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    552                                int start, int len) 
     552                               unsigned int start, unsigned int len) 
    553553{ 
    554554        return spi_write_chunked(flash, buf, start, len, 

  • trunk/flash.h

    r1459 r1470  
    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 
    … …  
    122122        int (*probe) (struct flashchip *flash); 
    123123 
    124         /* Delay after "enter/exit ID mode" commands in microseconds. */ 
    125         int probe_timing; 
     124        /* Delay after "enter/exit ID mode" commands in microseconds. 
     125         * NB: negative values have special meanings, see TIMING_* below. 
     126         */ 
     127        signed int probe_timing; 
    126128 
    127129        /* 
    … …  
    144146        int (*printlock) (struct flashchip *flash); 
    145147        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); 
     148        int (*write) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     149        int (*read) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    148150        struct { 
    149151                uint16_t min; 
    … …  
    203205extern char *chip_to_probe; 
    204206void map_flash_registers(struct flashchip *flash); 
    205 int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); 
     207int read_memmapped(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    206208int erase_flash(struct flashchip *flash); 
    207209int probe_flash(int startchip, struct flashchip *fill_flash, int force); 
    … …  
    211213void tolower_string(char *str); 
    212214char *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); 
    214 int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); 
     215int verify_range(struct flashchip *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, const char *message); 
     216int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran); 
    215217char *strcat_realloc(char *dest, const char *src); 
    216218void print_version(void); 

  • trunk/flashrom.c

    r1463 r1470  
    413413} 
    414414 
    415 int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len) 
     415int read_memmapped(struct flashchip *flash, uint8_t *buf, unsigned int start, int unsigned len) 
    416416{ 
    417417        chip_readn(buf, flash->virtual_memory + start, len); 
    … …  
    536536 
    537537/* start is an offset to the base address of the flash chip */ 
    538 int check_erased_range(struct flashchip *flash, int start, int len) 
     538int check_erased_range(struct flashchip *flash, unsigned int start, unsigned int len) 
    539539{ 
    540540        int ret; 
    … …  
    559559 * @return      0 for success, -1 for failure 
    560560 */ 
    561 int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, 
     561int verify_range(struct flashchip *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, 
    562562                 const char *message) 
    563563{ 
    564         int i; 
     564        unsigned int i; 
    565565        uint8_t *readbuf = malloc(len); 
    566566        int ret = 0, failcount = 0; 
    … …  
    640640 * @return      0 if no erase is needed, 1 otherwise 
    641641 */ 
    642 int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran) 
     642int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran) 
    643643{ 
    644644        int result = 0; 
    645         int i, j, limit; 
     645        unsigned int i, j, limit; 
    646646 
    647647        switch (gran) { 
    … …  
    706706 * length of the chip. 
    707707 */ 
    708 static int get_next_write(uint8_t *have, uint8_t *want, int len, 
    709                           int *first_start, enum write_granularity gran) 
    710 { 
    711         int need_write = 0, rel_start = 0, first_len = 0; 
    712         int i, limit, stride; 
     708static unsigned int get_next_write(uint8_t *have, uint8_t *want, unsigned int len, 
     709                          unsigned int *first_start, 
     710                          enum write_granularity gran) 
     711{ 
     712        int need_write = 0; 
     713        unsigned int rel_start = 0, first_len = 0; 
     714        unsigned int i, limit, stride; 
    713715 
    714716        switch (gran) { 
    … …  
    10311033{ 
    10321034        int ret; 
    1033         int total_size = flash->total_size * 1024; 
     1035        unsigned int total_size = flash->total_size * 1024; 
    10341036 
    10351037        msg_cinfo("Verifying flash... "); 
    … …  
    12091211                                                        unsigned int len)) 
    12101212{ 
    1211         int starthere = 0, lenhere = 0, ret = 0, skip = 1, writecount = 0; 
     1213        unsigned int starthere = 0, lenhere = 0; 
     1214        int ret = 0, skip = 1, writecount = 0; 
    12121215        enum write_granularity gran = write_gran_256bytes; /* FIXME */ 
    12131216 

  • trunk/ichspi.c

    r1464 r1470  
    12791279} 
    12801280 
    1281 int ich_hwseq_read(struct flashchip *flash, uint8_t *buf, int addr, int len) 
     1281int ich_hwseq_read(struct flashchip *flash, uint8_t *buf, unsigned int addr, 
     1282                   unsigned int len) 
    12821283{ 
    12831284        uint16_t hsfc; 
    … …  
    13161317} 
    13171318 
    1318 int ich_hwseq_write(struct flashchip *flash, uint8_t *buf, int addr, int len) 
     1319int ich_hwseq_write(struct flashchip *flash, uint8_t *buf, unsigned int addr, 
     1320                    unsigned int len) 
    13191321{ 
    13201322        uint16_t hsfc; 

  • trunk/it87spi.c

    r1463 r1470  
    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 = { 
    … …  
    314314/* Page size is usually 256 bytes */ 
    315315static int it8716f_spi_page_program(struct flashchip *flash, uint8_t *buf, 
    316                                     int start) 
    317 { 
    318         int i, result; 
     316                                    unsigned int start) 
     317{ 
     318        unsigned int i; 
     319        int result; 
    319320        chipaddr bios = flash->virtual_memory; 
    320321 
    … …  
    341342 */ 
    342343static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, 
    343                                  int start, int len) 
     344                                 unsigned int start, unsigned int len) 
    344345{ 
    345346        fast_spi = 0; 
    … …  
    359360 
    360361static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, 
    361                                       int start, int len) 
     362                                      unsigned int start, unsigned int len) 
    362363{ 
    363364        /* 
    … …  
    375376                spi_chip_write_1(flash, buf, start, len); 
    376377        } else { 
    377                 int lenhere; 
     378                unsigned int lenhere; 
    378379 
    379380                if (start % flash->page_size) { 

  • trunk/jedec.c

    r1450 r1470  
    9292} 
    9393 
    94 static int getaddrmask(struct flashchip *flash) 
     94static unsigned int getaddrmask(struct flashchip *flash) 
    9595{ 
    9696        switch (flash->feature_bits & FEATURE_ADDR_MASK) { 
    … …  
    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; 
    361361        chipaddr dst = flash->virtual_memory + start; 
    362362        chipaddr olddst; 
    363         int mask; 
     363        unsigned int mask; 
    364364 
    365365        mask = getaddrmask(flash); 
    … …  
    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; 
    … …  
    384384        chipaddr dst = bios + start; 
    385385        chipaddr d = dst; 
    386         int mask; 
     386        unsigned int mask; 
    387387 
    388388        mask = getaddrmask(flash); 
    … …  
    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) 
    428 { 
    429         int i, starthere, lenhere; 
     427int write_jedec(struct flashchip *flash, uint8_t *buf, unsigned int start, int unsigned len) 
     428{ 
     429        unsigned int i, starthere, lenhere; 
    430430        /* FIXME: page_size is the wrong variable. We need max_writechunk_size 
    431431         * in struct flashchip to do this properly. All chips using 
    … …  
    433433         * we're OK for now. 
    434434         */ 
    435         int page_size = flash->page_size; 
     435        unsigned int page_size = flash->page_size; 
    436436 
    437437        /* Warning: This loop has a very unusual condition and body. 
    … …  
    462462                           unsigned int blocksize) 
    463463{ 
    464         int mask; 
     464        unsigned int mask; 
    465465 
    466466        mask = getaddrmask(flash); 
    … …  
    475475int probe_jedec(struct flashchip *flash) 
    476476{ 
    477         int mask; 
     477        unsigned int mask; 
    478478 
    479479        mask = getaddrmask(flash); 
    … …  
    483483int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int size) 
    484484{ 
    485         int mask; 
     485        unsigned int mask; 
    486486 
    487487        mask = getaddrmask(flash); 
    … …  
    491491int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int size) 
    492492{ 
    493         int mask; 
     493        unsigned int mask; 
    494494 
    495495        mask = getaddrmask(flash); 
    … …  
    499499int erase_chip_jedec(struct flashchip *flash) 
    500500{ 
    501         int mask; 
     501        unsigned int mask; 
    502502 
    503503        mask = getaddrmask(flash); 

  • trunk/linux_spi.c

    r1432 r1470  
    3737static int linux_spi_send_command(unsigned int writecnt, unsigned int readcnt, 
    3838                        const unsigned char *txbuf, unsigned char *rxbuf); 
    39 static int linux_spi_read(struct flashchip *flash, uint8_t *buf, int start, 
    40                           int len); 
     39static int linux_spi_read(struct flashchip *flash, uint8_t *buf, 
     40                          unsigned int start, unsigned int len); 
    4141static int linux_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    42                                int start, int len); 
     42                               unsigned int start, unsigned int len); 
    4343 
    4444static const struct spi_programmer spi_programmer_linux = { 
    … …  
    132132} 
    133133 
    134 static int linux_spi_read(struct flashchip *flash, uint8_t *buf, int start, 
    135                           int len) 
     134static int linux_spi_read(struct flashchip *flash, uint8_t *buf, 
     135                          unsigned int start, unsigned int len) 
    136136{ 
    137         return spi_read_chunked(flash, buf, start, len, getpagesize()); 
     137        return spi_read_chunked(flash, buf, start, len, (unsigned)getpagesize()); 
    138138} 
    139139 
    140140static int linux_spi_write_256(struct flashchip *flash, uint8_t *buf, 
    141                                int start, int len) 
     141                               unsigned int start, unsigned int len) 
    142142{ 
    143         return spi_write_chunked(flash, buf, start, len, getpagesize() - 4); 
     143        return spi_write_chunked(flash, buf, start, len, ((unsigned)getpagesize()) - 4); 
    144144} 

  • trunk/m29f400bt.c

    r1450 r1470  
    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/opaque.c

    r1459 r1470  
    5454} 
    5555 
    56 int read_opaque(struct flashchip *flash, uint8_t *buf, int start, int len) 
     56int read_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    5757{ 
    5858        if (!opaque_programmer->read) { 
    … …  
    6565} 
    6666 
    67 int write_opaque(struct flashchip *flash, uint8_t *buf, int start, int len) 
     67int write_opaque(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    6868{ 
    6969        if (!opaque_programmer->write) { 

  • trunk/pm49fl00x.c

    r1414 r1470  
    2323#include "flash.h" 
    2424 
    25 static void write_lockbits_49fl00x(chipaddr bios, int size, 
    26                             unsigned char bits, int block_size) 
     25static void write_lockbits_49fl00x(chipaddr bios, unsigned int size, 
     26                            unsigned char bits, unsigned int block_size) 
    2727{ 
    28         int i, left = size; 
     28        unsigned int i, left = size; 
    2929 
    3030        for (i = 0; left >= block_size; i++, left -= block_size) { 

  • trunk/programmer.h

    r1463 r1470  
    564564struct spi_programmer { 
    565565        enum spi_controller type; 
    566         int max_data_read; 
    567         int max_data_write; 
     566        unsigned int max_data_read; 
     567        unsigned int max_data_write; 
    568568        int (*command)(unsigned int writecnt, unsigned int readcnt, 
    569569                   const unsigned char *writearr, unsigned char *readarr); 
    … …  
    571571 
    572572        /* Optimized functions for this programmer */ 
    573         int (*read)(struct flashchip *flash, uint8_t *buf, int start, int len); 
    574         int (*write_256)(struct flashchip *flash, uint8_t *buf, int start, int len); 
     573        int (*read)(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     574        int (*write_256)(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    575575}; 
    576576 
    … …  
    579579                             const unsigned char *writearr, unsigned char *readarr); 
    580580int default_spi_send_multicommand(struct spi_command *cmds); 
    581 int default_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); 
    582 int default_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); 
     581int default_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     582int default_spi_write_256(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    583583void register_spi_programmer(const struct spi_programmer *programmer); 
    584584 
    … …  
    626626        /* Specific functions for this programmer */ 
    627627        int (*probe) (struct flashchip *flash); 
    628         int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); 
    629         int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len); 
     628        int (*read) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
     629        int (*write) (struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len); 
    630630        int (*erase) (struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); 
    631631}; 

  • trunk/serprog.c

    r1463 r1470  
    303303                                    const unsigned char *writearr, 
    304304                                    unsigned char *readarr); 
    305 static int serprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, 
    306                             int len); 
     305static int serprog_spi_read(struct flashchip *flash, uint8_t *buf, 
     306                            unsigned int start, unsigned int len); 
    307307static struct spi_programmer spi_programmer_serprog = { 
    308308        .type           = SPI_CONTROLLER_SERPROG, 
    … …  
    823823 * non-contiguous address space (like AT45DB161D). When spi_read_chunked is 
    824824 * fixed this method can be removed. */ 
    825 static int serprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) 
    826 { 
    827         int i; 
    828         int cur_len; 
    829         const int max_read = spi_programmer_serprog.max_data_read; 
     825static int serprog_spi_read(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
     826{ 
     827        unsigned int i, cur_len; 
     828        const unsigned int max_read = spi_programmer_serprog.max_data_read; 
    830829        for (i = 0; i < len; i += cur_len) { 
    831830                int ret; 

  • trunk/spi.c

    r1450 r1470  
    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{ 
    126         int addrbase = 0; 
     126        unsigned int addrbase = 0; 
    127127        if (!spi_programmer->read) { 
    128128                msg_perr("%s called, but SPI read is unsupported on this " 
    … …  
    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

    r1454 r1470  
    841841} 
    842842 
    843 int spi_byte_program(int addr, uint8_t databyte) 
     843int spi_byte_program(unsigned int addr, uint8_t databyte) 
    844844{ 
    845845        int result; 
    … …  
    876876} 
    877877 
    878 int spi_nbyte_program(int addr, uint8_t *bytes, int len) 
     878int spi_nbyte_program(unsigned int addr, uint8_t *bytes, unsigned int len) 
    879879{ 
    880880        int result; 
    … …  
    951951} 
    952952 
    953 int spi_nbyte_read(int address, uint8_t *bytes, int len) 
     953int spi_nbyte_read(unsigned int address, uint8_t *bytes, unsigned int len) 
    954954{ 
    955955        const unsigned char cmd[JEDEC_READ_OUTSIZE] = { 
    … …  
    969969 * Each page is read separately in chunks with a maximum size of chunksize. 
    970970 */ 
    971 int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) 
     971int spi_read_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) 
    972972{ 
    973973        int rc = 0; 
    974         int i, j, starthere, lenhere; 
    975         int page_size = flash->page_size; 
    976         int toread; 
     974        unsigned int i, j, starthere, lenhere, toread; 
     975        unsigned int page_size = flash->page_size; 
    977976 
    978977        /* Warning: This loop has a very unusual condition and body. 
    … …  
    10091008 * Each page is written separately in chunks with a maximum size of chunksize. 
    10101009 */ 
    1011 int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) 
     1010int spi_write_chunked(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) 
    10121011{ 
    10131012        int rc = 0; 
    1014         int i, j, starthere, lenhere; 
     1013        unsigned int i, j, starthere, lenhere, towrite; 
    10151014        /* FIXME: page_size is the wrong variable. We need max_writechunk_size 
    10161015         * in struct flashchip to do this properly. All chips using 
    … …  
    10181017         * we're OK for now. 
    10191018         */ 
    1020         int page_size = flash->page_size; 
    1021         int towrite; 
     1019        unsigned int page_size = flash->page_size; 
    10221020 
    10231021        /* Warning: This loop has a very unusual condition and body. 
    … …  
    10581056 */ 
    10591057/* real chunksize is 1, logical chunksize is 1 */ 
    1060 int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len) 
    1061 { 
    1062         int i, result = 0; 
     1058int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
     1059{ 
     1060        unsigned int i; 
     1061        int result = 0; 
    10631062 
    10641063        for (i = start; i < start + len; i++) { 
    … …  
    10731072} 
    10741073 
    1075 int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len) 
     1074int spi_aai_write(struct flashchip *flash, uint8_t *buf, unsigned int start, unsigned int len) 
    10761075{ 
    10771076        uint32_t pos = start; 

  • trunk/sst28sf040.c

    r1450 r1470  
    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/sst49lfxxxc.c

    r1353 r1470  
    3636{ 
    3737        chipaddr registers = flash->virtual_registers; 
    38         int i, left = flash->total_size * 1024; 
     38        unsigned int i, left = flash->total_size * 1024; 
    3939        unsigned long address; 
    4040 

  • trunk/w39.c

    r1414 r1470  
    2222#include "flash.h" 
    2323 
    24 static int printlock_w39_fwh_block(struct flashchip *flash, int offset) 
     24static int printlock_w39_fwh_block(struct flashchip *flash, unsigned int offset) 
    2525{ 
    2626        chipaddr wrprotect = flash->virtual_registers + offset + 2; 
    … …  
    6060} 
    6161 
    62 static int unlock_w39_fwh_block(struct flashchip *flash, int offset) 
     62static int unlock_w39_fwh_block(struct flashchip *flash, unsigned int offset) 
    6363{ 
    6464        chipaddr wrprotect = flash->virtual_registers + offset + 2; 
    … …  
    8181} 
    8282 
    83 static uint8_t w39_idmode_readb(struct flashchip *flash, int offset) 
     83static uint8_t w39_idmode_readb(struct flashchip *flash, unsigned int offset) 
    8484{ 
    8585        chipaddr bios = flash->virtual_memory; 
    … …  
    128128} 
    129129 
    130 static int printlock_w39_common(struct flashchip *flash, int offset) 
     130static int printlock_w39_common(struct flashchip *flash, unsigned int offset) 
    131131{ 
    132132        uint8_t lock; 
    … …  
    139139static int printlock_w39_fwh(struct flashchip *flash) 
    140140{ 
    141         int i, total_size = flash->total_size * 1024; 
     141        unsigned int i, total_size = flash->total_size * 1024; 
    142142        int ret = 0; 
    143143         
    … …  
    151151static int unlock_w39_fwh(struct flashchip *flash) 
    152152{ 
    153         int i, total_size = flash->total_size * 1024; 
     153        unsigned int i, total_size = flash->total_size * 1024; 
    154154         
    155155        /* Unlock the complete chip */ 

  • trunk/wbsio_spi.c

    r1463 r1470  
    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.