diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-07-17 10:19:16 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-07-17 10:19:16 +0200 |
commit | 317ee8d7ffd4bb6c785f7a7d8a84ccd7f873513f (patch) | |
tree | f51362b3092abb782995f9c9d59e0252a660d3ac /testsuites/libtests | |
parent | Fix broken _endtext symbol (diff) | |
download | rtems-317ee8d7ffd4bb6c785f7a7d8a84ccd7f873513f.tar.bz2 |
score: Change greedy allocation API
Diffstat (limited to 'testsuites/libtests')
-rw-r--r-- | testsuites/libtests/block11/init.c | 10 | ||||
-rw-r--r-- | testsuites/libtests/devfs02/init.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c index 095d8bdf2d..b850aba950 100644 --- a/testsuites/libtests/block11/init.c +++ b/testsuites/libtests/block11/init.c @@ -229,6 +229,8 @@ static void test_blkdev_imfs_parameters(void) static void test_blkdev_imfs_errors(void) { + static uintptr_t disk_size [] = { sizeof(rtems_disk_device) + sizeof(int) }; + rtems_status_code sc; int rv; ramdisk *rd; @@ -257,7 +259,7 @@ static void test_blkdev_imfs_errors(void) ); rtems_test_assert(sc == RTEMS_INVALID_NUMBER); - opaque = rtems_heap_greedy_allocate(0); + opaque = rtems_heap_greedy_allocate(NULL, 0); sc = rtems_blkdev_create( rda, BLOCK_SIZE, @@ -268,7 +270,7 @@ static void test_blkdev_imfs_errors(void) rtems_test_assert(sc == RTEMS_NO_MEMORY); rtems_heap_greedy_free(opaque); - opaque = rtems_heap_greedy_allocate(sizeof(rtems_disk_device) + sizeof(int)); + opaque = rtems_heap_greedy_allocate(disk_size, 1); sc = rtems_blkdev_create( rda, BLOCK_SIZE, @@ -342,7 +344,7 @@ static void test_blkdev_imfs_errors(void) ); rtems_test_assert(sc == RTEMS_INVALID_NUMBER); - opaque = rtems_heap_greedy_allocate(0); + opaque = rtems_heap_greedy_allocate(NULL, 0); sc = rtems_blkdev_create_partition( rda1, rda, @@ -352,7 +354,7 @@ static void test_blkdev_imfs_errors(void) rtems_test_assert(sc == RTEMS_NO_MEMORY); rtems_heap_greedy_free(opaque); - opaque = rtems_heap_greedy_allocate(sizeof(rtems_disk_device) + sizeof(int)); + opaque = rtems_heap_greedy_allocate(disk_size, 1); sc = rtems_blkdev_create_partition( rda1, rda, diff --git a/testsuites/libtests/devfs02/init.c b/testsuites/libtests/devfs02/init.c index 47a70a8a50..ad37aeb94d 100644 --- a/testsuites/libtests/devfs02/init.c +++ b/testsuites/libtests/devfs02/init.c @@ -62,7 +62,7 @@ rtems_task Init( puts( "Init - restore device table size" ); rootloc->mt_entry->immutable_fs_info = data; - opaque = rtems_heap_greedy_allocate( 0 ); + opaque = rtems_heap_greedy_allocate( NULL, 0 ); puts( "Init - attempt to create a node - expect ENOMEM" ); status = mknod( "/node", S_IFBLK, 0LL ); |