Changeset 72755421 in rtems


Ignore:
Timestamp:
Jun 12, 2009, 2:59:18 AM (10 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
0c871423
Parents:
7baa484
Message:

2009-06-12 Chris Johns <chrisj@…>

  • libblock/include/rtems/flashdisk.h, libblock/include/rtems/nvdisk.h, libblock/src/flashdisk.c, libblock/src/nvdisk.c: Change names to match the RAM disk change.
  • libcsupport/src/eval.c: Remove some warnings.
Location:
cpukit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r7baa484 r72755421  
     12009-06-12      Chris Johns <chrisj@rtems.org>
     2
     3        * libblock/include/rtems/flashdisk.h,
     4        libblock/include/rtems/nvdisk.h, libblock/src/flashdisk.c,
     5        libblock/src/nvdisk.c: Change names to match the RAM disk change.
     6        * libcsupport/src/eval.c: Remove some warnings.
     7       
    182009-06-12      Chris Johns <chrisj@rtems.org>
    29
  • cpukit/libblock/include/rtems/flashdisk.h

    r7baa484 r72755421  
    2222 * The base name of the flash disks.
    2323 */
    24 #define RTEMS_FLASHDISK_DEVICE_BASE_NAME "/dev/flashdisk"
     24#define RTEMS_FLASHDISK_DEVICE_BASE_NAME "/dev/fdd"
    2525
    2626/**
  • cpukit/libblock/include/rtems/nvdisk.h

    r7baa484 r72755421  
    3232 * The base name of the nv disks.
    3333 */
    34 #define RTEMS_NVDISK_DEVICE_BASE_NAME "/dev/nvdisk"
     34#define RTEMS_NVDISK_DEVICE_BASE_NAME "/dev/nvd"
    3535
    3636/**
  • cpukit/libblock/src/flashdisk.c

    r7baa484 r72755421  
    24572457  for (minor = 0; minor < rtems_flashdisk_configuration_size; minor++, c++)
    24582458  {
    2459     char     name[sizeof (RTEMS_FLASHDISK_DEVICE_BASE_NAME) + 10];
     2459    char     name[] = RTEMS_FLASHDISK_DEVICE_BASE_NAME "a";
    24602460    dev_t    dev = rtems_filesystem_make_dev_t (major, minor);
    24612461    uint32_t device;
     
    24652465    fd = &rtems_flashdisks[minor];
    24662466 
    2467     snprintf (name, sizeof (name),
    2468               RTEMS_FLASHDISK_DEVICE_BASE_NAME "%" PRIu32, minor);
     2467    name [sizeof(RTEMS_FLASHDISK_DEVICE_BASE_NAME)] += minor;
    24692468 
    24702469    fd->major              = major;
  • cpukit/libblock/src/nvdisk.c

    r7baa484 r72755421  
    791791  for (minor = 0; minor < rtems_nvdisk_configuration_size; minor++, c++)
    792792  {
    793     char     name[sizeof (RTEMS_NVDISK_DEVICE_BASE_NAME) + 10];
     793    char     name[] = RTEMS_NVDISK_DEVICE_BASE_NAME "a";
    794794    dev_t    dev = rtems_filesystem_make_dev_t (major, minor);
    795795    uint32_t device;
     
    798798    nvd = &rtems_nvdisks[minor];
    799799 
    800     snprintf (name, sizeof (name),
    801               RTEMS_NVDISK_DEVICE_BASE_NAME "%" PRIu32, minor);
     800    name [sizeof(RTEMS_NVDISK_DEVICE_BASE_NAME)] += minor;
    802801 
    803802    nvd->major        = major;
  • cpukit/libcsupport/src/eval.c

    r7baa484 r72755421  
    3030)
    3131{
    32   int                           i;
     32  //int                           i;
    3333  int                           result;
    3434  rtems_filesystem_node_types_t type;
     
    4747    rtems_set_errno_and_return_minus_one( ENOTSUP );
    4848
    49   result = (*pathloc->ops->evalpath_h)( &pathname[i], pathnamelen, flags, pathloc );
     49  result = (*pathloc->ops->evalpath_h)( pathname, pathnamelen, flags, pathloc );
    5050
    5151  /*
     
    100100)
    101101{
    102   int                           i;
    103   int                           result;
    104   rtems_filesystem_node_types_t type;
     102  int                           i = 0;
    105103
    106104  /*
     
    123121   * We evaluation the path relative to the start location we get got.
    124122   */
    125   return rtems_filesystem_evaluate_relative_path( pathname,
    126                                                   pathnamelen,
     123  return rtems_filesystem_evaluate_relative_path( &pathname[i],
     124                                                  pathnamelen - i,
    127125                                                  flags,
    128126                                                  pathloc,
Note: See TracChangeset for help on using the changeset viewer.