Changeset dfce6724 in rtems


Ignore:
Timestamp:
Jun 2, 2010, 12:43:13 AM (9 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
558a5f4
Parents:
d9120e56
Message:

2010-06-01 Chris Johns <chrisj@…>

  • libcsupport/include/rtems/libio.h: Make the struct name the same as the typedef.
  • sapi/include/confdefs.h: Fixes for use in C++.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rd9120e56 rdfce6724  
     12010-06-01      Chris Johns <chrisj@rtems.org>
     2
     3        * libcsupport/include/rtems/libio.h: Make the struct name the same
     4        as the typedef.
     5        * sapi/include/confdefs.h: Fixes for use in C++.
     6
    172010-06-01      Ralf Corsépius <ralf.corsepius@rtems.org>
    28
  • cpukit/libcsupport/include/rtems/libio.h

    rd9120e56 rdfce6724  
    293293 * File system table used by mount to manage file systems.
    294294 */
    295 typedef struct _rtems_filesystem_table {
     295typedef struct rtems_filesystem_table_t {
    296296  const char                    *type;
    297297  rtems_filesystem_fsmount_me_t  mount_h;
     
    301301 * File system table runtime loaded nodes.
    302302 */
    303 typedef struct _rtems_filesystem_table_node {
     303typedef struct rtems_filesystem_table_node_t {
    304304  rtems_chain_node         node;
    305305  rtems_filesystem_table_t entry;
  • cpukit/sapi/include/confdefs.h

    rd9120e56 rdfce6724  
    7272  #define CONFIGURE_NEWLIB_EXTENSION 0
    7373#endif
    74 
    7574
    7675#include <rtems/libio.h>
     
    231230   * If disabling the file system undef everything. If DEVFS as the base
    232231   * filesystem undefine all other filesystems because you cannot mount other
    233    * filesystems.
     232   * filesystems. Same for miniIMFS.
    234233   */
    235234  #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) || \
    236       defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
     235      defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
     236      defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
    237237    #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
    238238      #undef CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
     239      #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
     240    #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
     241      #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
    239242    #endif
    240243    #undef CONFIGURE_FILESYSTEM_miniIMFS
     
    252255   * We will have either DEVFS or IMFS defined after this.
    253256   */
    254   #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) && \
    255       !defined(CONFIGURE_FILESYSTEM_DEVFS)
     257  #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
    256258    #define CONFIGURE_FILESYSTEM_DEVFS
     259  #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
     260    #define CONFIGURE_FILESYSTEM_miniIMFS
    257261  #elif !defined(CONFIGURE_FILESYSTEM_IMFS)
    258262    #define CONFIGURE_FILESYSTEM_IMFS
     
    276280                    IMFS_MEMFILE_DEFAULT_BYTES_PER_BLOCK
    277281#endif
    278 
    279 #ifdef CONFIGURE_INIT
    280   int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
    281 #endif /* CONFIGURE_INIT */
    282282
    283283/**
     
    358358   *  DEVFS variables.
    359359   */
    360   #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && !defined(RTEMS_COVERAGE)
     360  #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) && \
     361      !defined(RTEMS_COVERAGE)
    361362    #define CONFIGURE_MEMORY_FOR_DEVFS  0
    362363  #elif defined(CONFIGURE_FILESYSTEM_DEVFS)
     
    376377  #endif
    377378
     379  #if defined(CONFIGURE_FILESYSTEM_IMFS) || \
     380      defined(CONFIGURE_FILESYSTEM_miniIMFS)
     381    int imfs_rq_memfile_bytes_per_block = CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK;
     382  #endif
     383
    378384  /**
    379385   * Table termination record.
     
    384390   * The default file system table. Must be terminated with the NULL entry if
    385391   * you provide your own.
    386    */
     392   *
     393   * The extern is needed to stop the table being removed by the optimizer.
     394   */
     395  extern const rtems_filesystem_table_t configuration_filesystem_table[];
    387396  #ifndef CONFIGURE_HAS_OWN_FILESYSTEM_TABLE
    388397    const rtems_filesystem_table_t configuration_filesystem_table[] = {
     
    429438   */
    430439  #if !defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
    431        defined(RTEMS_COVERAGE)
     440      defined(RTEMS_COVERAGE)
    432441    #if defined(CONFIGURE_PIPES_ENABLED)
    433442      bool rtems_pipe_configured = true;
Note: See TracChangeset for help on using the changeset viewer.