Changeset 45ada30 in rtems


Ignore:
Timestamp:
05/24/12 16:07:24 (11 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
246e23c
Parents:
a61fc251 (diff), 4acbff6 (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:
93 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    ra61fc251 r45ada30  
    22autom4te.cache
    33configure
    4 config.h.in
    54Makefile.in

  • cpukit/libblock/src/bdbuf.c

    ra61fc251 r45ada30  
    297297{
    298298  const char* states[] =
    299     { "FR", "EM", "CH", "AC", "AM", "MD", "SY", "TR" };
     299    { "FR", "EM", "CH", "AC", "AM", "AE", "AP", "MD", "SY", "TR", "TP" };
    300300
    301301  printf ("bdbuf:users: %15s: [%" PRIu32 " (%s)] %td:%td = %" PRIu32 " %s\n",
    … …  
    18491849  rtems_blkdev_bnum   media_block_end = dd->start + dd->size;
    18501850  rtems_blkdev_bnum   media_block_count = dd->block_to_media_block_shift >= 0 ?
    1851     dd->block_size >> dd->block_to_media_block_shift
     1851    1U << dd->block_to_media_block_shift
    18521852      : dd->block_size / dd->media_block_size;
    18531853  uint32_t            block_size = dd->block_size;

  • cpukit/libmisc/shell/main_lsof.c

    ra61fc251 r45ada30  
    1616  #include "config.h"
    1717#endif
     18
     19#include <stdio.h>
    1820
    1921#include <rtems/libio_.h>
    … …  
    3638    rtems_chain_node *mt_entry_node = NULL;
    3739
    38     printk(
     40    fprintf(
     41      stdout,
    3942      "%c %c %s %s -> %s root 0x%08x -> 0x%08x\n",
    4043      mt_entry->mounted ? 'M' : 'U',
    … …  
    5558        (rtems_filesystem_location_info_t *) mt_entry_node;
    5659
    57       printk(
     60      fprintf(
     61        stdout,
    5862        "\t0x%08x -> 0x%08x\n",
    5963        loc,
Note: See TracChangeset for help on using the changeset viewer.