ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from deepikabhavnani/error_fix1 

Correct error codes as per mbed-os/pull/6336
pull/7774/head
Deepika Bhavnani 2018-07-10 10:49:38 -05:00 committed by GitHub
parent d70239c460 1e13bfe641
commit c8ae38fb29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SDBlockDevice.cpp
View File

@ -142,13 +142,13 @@
#include "mbed_debug.h"
#include <errno.h>
/* Required version: 5.8.0 and above */
#if defined( MBED_MAJOR_VERSION) && MBED_MAJOR_VERSION >= 5
#if (MBED_VERSION < MBED_ENCODE_VERSION(5,8,0))
#error "Incompatible mbed-os version detected! Required 5.8.0 and above"
/* Required version: 5.9.0 and above */
#if defined(MBED_MAJOR_VERSION) && MBED_MAJOR_VERSION >= 5
#if (MBED_VERSION < MBED_ENCODE_VERSION(5,9,0))
#error "Incompatible mbed-os version detected! Required 5.9.0 and above"
#endif
#else
#warning "mbed-os version 5.8.0 or above required"
#warning "mbed-os version 5.9.0 or above required"
#endif
#ifndef MBED_CONF_SD_CMD_TIMEOUT

2
TESTS/filesystem/dirs/main.cpp
View File

@ -188,7 +188,7 @@ void test_directory_failures() {
res = fs.mkdir("potato", 0777);
TEST_ASSERT_EQUAL(-EEXIST, res);
res = dir[0].open(&fs, "tomato");
TEST_ASSERT_EQUAL(-ENOENT, res);
TEST_ASSERT_EQUAL(-ENOTDIR, res);
res = dir[0].open(&fs, "burito");
TEST_ASSERT_NOT_EQUAL(0, res);
res = file[0].open(&fs, "tomato", O_RDONLY);