Changeset d2bb25ae in rtems


Ignore:
Timestamp:
Jul 2, 2012, 3:04:03 PM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
90bd18e
Parents:
75ba62e (diff), 71092f7 (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 branch 'upstream'

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libblock/src/bdbuf.c

    r75ba62e rd2bb25ae  
    30283028          {
    30293029            transfer_count = max_transfer_count;
    3030             dd->read_ahead.trigger = block + (transfer_count + 1) / 2;
     3030            dd->read_ahead.trigger = block + transfer_count / 2;
    30313031            dd->read_ahead.next = block + transfer_count;
    30323032          }
  • testsuites/libtests/block13/init.c

    r75ba62e rd2bb25ae  
    4343  7, 8,
    4444  RESET_CACHE,
    45   6, 7, 10
     45  6, 7, 9
    4646};
    4747
     
    5151   { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
    5252   { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 },
    53    { 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
    5453   { 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
    5554   { 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0 },
     
    5958   { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
    6059   { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
     60   { 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
    6161   UNUSED_LINE,
    6262   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
     
    7979
    8080static const rtems_blkdev_bnum trigger [READ_COUNT] = {
    81   1, 3, 6, 6, 6, 9, 9, 9, NO_TRIGGER, NO_TRIGGER,
     81  1, 3, 5, 5, 8, 8, 8, NO_TRIGGER, NO_TRIGGER, NO_TRIGGER,
    8282  TRIGGER_AFTER_RESET,
    8383  11,
     
    8989  8, NO_TRIGGER,
    9090  TRIGGER_AFTER_RESET,
    91   7, 10, NO_TRIGGER
     91  7, 9, NO_TRIGGER
    9292};
    9393
     
    9595
    9696static const rtems_blkdev_bnum next [READ_COUNT] = {
    97   2, 4, 7, 7, 7, 10, 10, 10, 10, 10,
     97  2, 4, 7, 7, 10, 10, 10, 10, 10, 10,
    9898  NOT_CHANGED_BY_RESET(10),
    9999  12,
Note: See TracChangeset for help on using the changeset viewer.