Changeset 8a2ea93e in rtems


Ignore:
Timestamp:
Jun 4, 2012, 3:31:21 PM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1a9e5c2
Parents:
2e4ead3 (diff), b2cb8d6 (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:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/t32mppc/configsim.t32

    r2e4ead3 r8a2ea93e  
    11PBI=SIM
    2 
    32SCREEN=
     3HEADER=Simulator
    44FONT=DEC
    55FONT=SMALL
    6 
    7 HEADER=Simulator
  • cpukit/include/rtems/bspIo.h

    r2e4ead3 r8a2ea93e  
    6565extern int printk_plugin(void *context, const char *fmt, ...);
    6666
     67extern int rtems_printf_plugin(void *context, const char *fmt, ...);
     68
    6769/*
    6870 *  Type definition for function which can be plugged in to
  • cpukit/libblock/include/rtems/diskdevs.h

    r2e4ead3 r8a2ea93e  
    6262
    6363/**
    64  * @brief Read-ahead control.
     64 * @brief Block device read-ahead control.
    6565 */
    6666typedef struct {
     
    8585   */
    8686  rtems_blkdev_bnum next;
    87 } rtems_disk_read_ahread;
     87} rtems_blkdev_read_ahead;
    8888
    8989/**
     
    205205   * @brief Read-ahead control for this disk.
    206206   */
    207   rtems_disk_read_ahread read_ahead;
     207  rtems_blkdev_read_ahead read_ahead;
    208208};
    209209
  • cpukit/libcsupport/Makefile.am

    r2e4ead3 r8a2ea93e  
    121121libcsupport_a_SOURCES = src/gxx_wrappers.c src/getchark.c src/printk.c \
    122122    src/printk_plugin.c src/putk.c src/vprintk.c \
     123    src/printf_plugin.c \
    123124    src/sup_fs_location.c \
    124125    src/sup_fs_eval_path.c \
  • testsuites/libtests/block13/init.c

    r2e4ead3 r8a2ea93e  
    4646#define UNUSED_LINE { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
    4747
    48 static int expected_block_access_counts [READ_COUNT] [BLOCK_COUNT] = {
     48static const int expected_block_access_counts [READ_COUNT] [BLOCK_COUNT] = {
    4949   { 1, 0, 0, 0, 0, 0, 0, 0, 0 },
    5050   { 1, 0, 1, 0, 0, 0, 0, 0, 0 },
Note: See TracChangeset for help on using the changeset viewer.