Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25e963a in mainline


Ignore:
Timestamp:
2010-02-06T10:49:36Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
696979ce, f27ada7
Parents:
a281fc82 (diff), 3f93cdbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from the file system branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/fat/fat_fat.c

    ra281fc82 r25e963a  
    361361        uint16_t rscnt;
    362362        uint16_t sf;
    363         uint16_t ts;
     363        uint32_t ts;
    364364        unsigned rde;
    365365        unsigned rds;
     
    379379        sf = uint16_t_le2host(bs->sec_per_fat);
    380380        rde = uint16_t_le2host(bs->root_ent_max);
    381         ts = uint16_t_le2host(bs->totsec16);
     381        ts = (uint32_t) uint16_t_le2host(bs->totsec16);
     382        if (ts == 0)
     383                ts = uint32_t_le2host(bs->totsec32);
    382384
    383385        rds = (sizeof(fat_dentry_t) * rde) / bps;
Note: See TracChangeset for help on using the changeset viewer.