Changeset 80c1577 in rtems


Ignore:
Timestamp:
Jul 26, 2010, 9:28:06 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
bc3fe3c
Parents:
04323c98
Message:

2010-07-26 Joel Sherrill <joel.sherrill@…>

  • sapi/include/confdefs.h: Do not cover up user configuation mistakes on filesystems -- cite them as errors.
Location:
cpukit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r04323c98 r80c1577  
     12010-07-26      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * sapi/include/confdefs.h: Do not cover up user configuation mistakes
     4        on filesystems -- cite them as errors.
     5
    162010-07-26      Joel Sherrill <joel.sherrill@oarcorp.com>
    27
  • cpukit/sapi/include/confdefs.h

    r04323c98 r80c1577  
    224224
    225225  /*
    226    * If disabling the file system undef everything. If DEVFS as the base
    227    * filesystem undefine all other filesystems because you cannot mount other
    228    * filesystems. Same for miniIMFS.
    229    */
    230   #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM) || \
    231       defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
    232       defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
    233     #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
    234       #undef CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM
    235       #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
    236     #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
    237       #undef CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM
    238     #endif
    239     #undef CONFIGURE_FILESYSTEM_MINIIMFS
    240     #undef CONFIGURE_FILESYSTEM_IMFS
    241     #undef CONFIGURE_FILESYSTEM_DEVFS
    242     #undef CONFIGURE_FILESYSTEM_TFTPFS
    243     #undef CONFIGURE_FILESYSTEM_FTPFS
    244     #undef CONFIGURE_FILESYSTEM_NFS
    245     #undef CONFIGURE_FILESYSTEM_DOSFS
    246     #undef CONFIGURE_FILESYSTEM_RFS
     226   * If disabling the file system, give a compile error if the user has
     227   * configured other filesystem parameters.
     228   */
     229  #if defined(CONFIGURE_APPLICATION_DISABLE_FILESYSTEM)
     230     #if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \
     231         defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
     232       #error "Filesystem disabled but a base filesystem configured."
     233     #endif
     234
     235    #if defined(CONFIGURE_FILESYSTEM_MINIIMFS) || \
     236        defined(CONFIGURE_FILESYSTEM_IMFS) || \
     237        defined(CONFIGURE_FILESYSTEM_DEVFS) || \
     238        defined(CONFIGURE_FILESYSTEM_TFTPFS) || \
     239        defined(CONFIGURE_FILESYSTEM_FTPFS) || \
     240        defined(CONFIGURE_FILESYSTEM_NFS) || \
     241        defined(CONFIGURE_FILESYSTEM_DOSFS) || \
     242        defined(CONFIGURE_FILESYSTEM_RFS)
     243        #error "Configured filessystems but root filesystem was not IMFS!"
     244        #error "Filesystems coule be disabled, DEVFS is root, or"
     245        #error "  miniIMFS is root!"
     246     #endif
    247247  #endif
    248248
Note: See TracChangeset for help on using the changeset viewer.