Skip to content

Commit a1885de

Browse files
mclib-devmclib-dev
authored
Merge pull request #2 from mindsphere/dev
Dev
2 parents 2eeaf1a + 810241f commit a1885de

File tree

10 files changed

+418
-13
lines changed

10 files changed

+418
-13
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# [4.2.4] (2020-11-28)
2+
3+
## Features
4+
5+
* MCL is ported to be used by mbedOS applications.
6+
17
# [4.2.3] (2020-10-10)
28

39
## Bug Fixes

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,11 @@ $ cmake --build . --clean-first
363363

364364
You will find agent application executable named **\<CustomAgentApplication\>** in **\<Custom_Agent_Build_Directory>\**.
365365

366+
### Building MCL In Specific Environments
367+
Although the default build tool is CMake, MCL is ported to be built as part of other SDK in specific environments. You can build MCL as part of an mbedOS application by
368+
importing MCL as a library to your application in mbedOS development environment. You can integrate MCL to Sony Spresense environment to be built together
369+
with Sony Spresense SDK by following the document <a href = "./SonySpresenseGuide.md" target="_blank"><u>Sony Spresense Guide</u></a> provided with MCL source code.
370+
366371
## Accessing Reference Documentation
367372
You can access reference documentation online from https://developer.mindsphere.io/resources/mindconnect-lib-v4/doxygen/html/index.html.
368373
Alternatively, you can generate a local copy of the reference documentation using Doxygen.

‎mcl_connectivity/.mbedignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
doc/*
2+
examples/*
3+
test/*

‎mcl_core/.mbedignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
doc/*
2+
examples/*
3+
test/*
4+
src/crypto/openssl/*
5+
src/http_client/curl/*
6+
src/http_client/basic/mbedtls*

‎mcl_core/include/mcl_core/mcl_config.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
* It can be overridden by a global preprocessor definition as it is when building with CMake.
2323
*/
2424
#ifndef HAVE_FILE_SYSTEM_
25+
#ifdef __MBED__
26+
#define HAVE_FILE_SYSTEM_ 0
27+
#else
2528
#define HAVE_FILE_SYSTEM_ 1
29+
#endif
2630
#endif
2731

2832
/**

‎mcl_core/include/mcl_core/mcl_version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#define MCL_VERSION_MAJOR 4
1313
#define MCL_VERSION_MINOR 2
14-
#define MCL_VERSION_PATCH 3
14+
#define MCL_VERSION_PATCH 4
1515

16-
#define MCL_VERSION_NUMBER 0x04020300
17-
#define MCL_VERSION_STRING "4.2.3"
16+
#define MCL_VERSION_NUMBER 0x04020400
17+
#define MCL_VERSION_STRING "4.2.4"
1818

1919
#endif //MCL_VERSION_H_

‎mcl_core/src/file_util/standard/file_util.c

Lines changed: 81 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,24 @@
88

99
#include "file_util.h"
1010
#include "mcl_core/mcl_assert.h"
11+
#include <stdio.h>
12+
13+
#if HAVE_FILE_SYSTEM_
1114
#include <sys/stat.h>
1215
#include <sys/types.h>
13-
#include <stdio.h>
16+
17+
static mcl_error_t _file_util_fstat(void *file_descriptor, struct stat *file_attributes);
18+
#else
19+
static const char mcl_no_file_system_message[] = "MCL file utility cannot be used.";
20+
#endif
1421

1522
#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
1623
#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
1724
#endif
1825

19-
static mcl_error_t _file_util_fstat(void *file_descriptor, struct stat *file_attributes);
20-
2126
mcl_error_t mcl_file_util_fopen(const char *file_name, const char *mode, void **file_descriptor)
2227
{
28+
#if HAVE_FILE_SYSTEM_
2329
mcl_error_t return_code;
2430

2531
MCL_DEBUG_ENTRY("const char *file_name = <%s>, const char *mode = <%s>, void **file_descriptor = <%p>", file_name, mode, file_descriptor);
@@ -28,12 +34,16 @@ mcl_error_t mcl_file_util_fopen(const char *file_name, const char *mode, void **
2834

2935
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
3036
return return_code;
37+
#else
38+
MCL_ERROR_STRING(mcl_no_file_system_message);
39+
return MCL_FAIL;
40+
#endif
3141
}
3242

3343
mcl_error_t mcl_file_util_fopen_without_log(const char *file_name, const char *mode, void **file_descriptor)
3444
{
45+
#if HAVE_FILE_SYSTEM_
3546
mcl_error_t return_code = MCL_OK;
36-
3747
FILE *file;
3848

3949
#if defined(WIN32) || defined(WIN64)
@@ -47,11 +57,15 @@ mcl_error_t mcl_file_util_fopen_without_log(const char *file_name, const char *m
4757
return_code = MCL_FAIL;
4858
}
4959

50-
return return_code;
60+
return return_code;
61+
#else
62+
return MCL_FAIL;
63+
#endif
5164
}
5265

5366
mcl_error_t mcl_file_util_fclose(void *file_descriptor)
5467
{
68+
#if HAVE_FILE_SYSTEM_
5569
mcl_error_t return_code;
5670

5771
MCL_DEBUG_ENTRY("void *file_descriptor = <%p>", file_descriptor);
@@ -60,10 +74,15 @@ mcl_error_t mcl_file_util_fclose(void *file_descriptor)
6074

6175
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
6276
return return_code;
77+
#else
78+
MCL_ERROR_STRING(mcl_no_file_system_message);
79+
return MCL_FAIL;
80+
#endif
6381
}
6482

6583
mcl_error_t mcl_file_util_fclose_without_log(void *file_descriptor)
6684
{
85+
#if HAVE_FILE_SYSTEM_
6786
mcl_error_t return_code = MCL_OK;
6887

6988
if (MCL_NULL != file_descriptor)
@@ -76,10 +95,14 @@ mcl_error_t mcl_file_util_fclose_without_log(void *file_descriptor)
7695
}
7796

7897
return return_code;
98+
#else
99+
return MCL_FAIL;
100+
#endif
79101
}
80102

81103
mcl_error_t mcl_file_util_fwrite(const void *data, mcl_size_t size, mcl_size_t count, void *file_descriptor)
82104
{
105+
#if HAVE_FILE_SYSTEM_
83106
mcl_error_t return_code;
84107

85108
MCL_DEBUG_ENTRY("const void *data = <%p>, mcl_size_t size = <%u>, mcl_size_t count = <%u>, void *file_descriptor = <%p>", data, size, count, file_descriptor);
@@ -88,10 +111,15 @@ mcl_error_t mcl_file_util_fwrite(const void *data, mcl_size_t size, mcl_size_t c
88111

89112
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
90113
return return_code;
114+
#else
115+
MCL_ERROR_STRING(mcl_no_file_system_message);
116+
return MCL_FAIL;
117+
#endif
91118
}
92119

93120
mcl_error_t mcl_file_util_fwrite_without_log(const void *data, mcl_size_t size, mcl_size_t count, void *file_descriptor)
94121
{
122+
#if HAVE_FILE_SYSTEM_
95123
mcl_error_t return_code = MCL_FAIL;
96124

97125
mcl_size_t actual_count = fwrite(data, size, count, (FILE *)file_descriptor);
@@ -105,20 +133,28 @@ mcl_error_t mcl_file_util_fwrite_without_log(const void *data, mcl_size_t size,
105133
}
106134

107135
return return_code;
136+
#else
137+
return MCL_FAIL;
138+
#endif
108139
}
109140

110141
void mcl_file_util_fread(void *data, mcl_size_t size, mcl_size_t count, void *file_descriptor, mcl_size_t *actual_count)
111142
{
143+
#if HAVE_FILE_SYSTEM_
112144
MCL_DEBUG_ENTRY("void *data = <%p>, mcl_size_t size = <%u>, mcl_size_t count = <%u>, void *file_descriptor = <%p>, mcl_size_t *actual_count = <%p>", data, size, count,
113145
file_descriptor, actual_count);
114146

115147
*actual_count = fread(data, size, count, (FILE *)file_descriptor);
116148

117149
MCL_DEBUG_LEAVE("retVal = void");
150+
#else
151+
MCL_ERROR_STRING(mcl_no_file_system_message);
152+
#endif
118153
}
119154

120155
mcl_error_t mcl_file_util_fputs(const char *data, void *file_descriptor)
121156
{
157+
#if HAVE_FILE_SYSTEM_
122158
mcl_error_t return_code = MCL_FAIL;
123159
mcl_error_t result;
124160

@@ -136,10 +172,15 @@ mcl_error_t mcl_file_util_fputs(const char *data, void *file_descriptor)
136172

137173
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
138174
return return_code;
175+
#else
176+
MCL_ERROR_STRING(mcl_no_file_system_message);
177+
return MCL_FAIL;
178+
#endif
139179
}
140180

141181
mcl_error_t mcl_file_util_fgets(char *data, mcl_size_t data_size, void *file_descriptor)
142182
{
183+
#if HAVE_FILE_SYSTEM_
143184
mcl_error_t return_code = MCL_FAIL;
144185
char *output;
145186

@@ -157,10 +198,15 @@ mcl_error_t mcl_file_util_fgets(char *data, mcl_size_t data_size, void *file_des
157198

158199
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
159200
return return_code;
201+
#else
202+
MCL_ERROR_STRING(mcl_no_file_system_message);
203+
return MCL_FAIL;
204+
#endif
160205
}
161206

162207
mcl_error_t mcl_file_util_fflush(void *file_descriptor)
163208
{
209+
#if HAVE_FILE_SYSTEM_
164210
mcl_error_t return_code;
165211

166212
MCL_DEBUG_ENTRY("void *file_descriptor = <%p>", file_descriptor);
@@ -169,18 +215,19 @@ mcl_error_t mcl_file_util_fflush(void *file_descriptor)
169215

170216
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
171217
return return_code;
218+
#else
219+
MCL_ERROR_STRING(mcl_no_file_system_message);
220+
return MCL_FAIL;
221+
#endif
172222
}
173223

174224
mcl_error_t mcl_file_util_fflush_without_log(void *file_descriptor)
175225
{
226+
#if HAVE_FILE_SYSTEM_
176227
mcl_error_t return_code = MCL_FAIL;
177228
int result;
178229

179-
#if defined(WIN32) || defined(WIN64)
180230
result = fflush((FILE *)file_descriptor);
181-
#else
182-
result = fflush((FILE *)file_descriptor);
183-
#endif
184231

185232
if (0 == result)
186233
{
@@ -192,10 +239,15 @@ mcl_error_t mcl_file_util_fflush_without_log(void *file_descriptor)
192239
}
193240

194241
return return_code;
242+
#else
243+
MCL_ERROR_STRING(mcl_no_file_system_message);
244+
return MCL_FAIL;
245+
#endif
195246
}
196247

197248
void mcl_file_util_rewind(void *file_descriptor)
198249
{
250+
#if HAVE_FILE_SYSTEM_
199251
MCL_DEBUG_ENTRY("void *file_descriptor = <%p>", file_descriptor);
200252

201253
if (MCL_NULL != file_descriptor)
@@ -204,10 +256,14 @@ void mcl_file_util_rewind(void *file_descriptor)
204256
}
205257

206258
MCL_DEBUG_LEAVE("retVal = void");
259+
#else
260+
MCL_ERROR_STRING(mcl_no_file_system_message);
261+
#endif
207262
}
208263

209264
mcl_bool_t mcl_file_util_check_if_regular_file(void *file_descriptor)
210265
{
266+
#if HAVE_FILE_SYSTEM_
211267
mcl_bool_t is_regular_file = MCL_FALSE;
212268
struct stat file_attributes;
213269

@@ -222,10 +278,15 @@ mcl_bool_t mcl_file_util_check_if_regular_file(void *file_descriptor)
222278

223279
MCL_DEBUG_LEAVE("retVal = <%d>", is_regular_file);
224280
return is_regular_file;
281+
#else
282+
MCL_ERROR_STRING(mcl_no_file_system_message);
283+
return MCL_FALSE;
284+
#endif
225285
}
226286

227287
mcl_size_t mcl_file_util_get_file_size(void *file_descriptor)
228288
{
289+
#if HAVE_FILE_SYSTEM_
229290
struct stat file_attributes;
230291
mcl_size_t file_size = 0;
231292

@@ -238,10 +299,15 @@ mcl_size_t mcl_file_util_get_file_size(void *file_descriptor)
238299

239300
MCL_DEBUG_LEAVE("retVal = <%u>", file_size);
240301
return file_size;
302+
#else
303+
MCL_ERROR_STRING(mcl_no_file_system_message);
304+
return 0;
305+
#endif
241306
}
242307

243308
mcl_time_t mcl_file_util_get_time_of_last_status_change(void *file_descriptor)
244309
{
310+
#if HAVE_FILE_SYSTEM_
245311
struct stat file_attributes;
246312
mcl_time_t time = 0;
247313

@@ -254,8 +320,13 @@ mcl_time_t mcl_file_util_get_time_of_last_status_change(void *file_descriptor)
254320

255321
MCL_DEBUG_LEAVE("retVal = <%u>", time);
256322
return time;
323+
#else
324+
MCL_ERROR_STRING(mcl_no_file_system_message);
325+
return 0;
326+
#endif
257327
}
258328

329+
#if HAVE_FILE_SYSTEM_
259330
static mcl_error_t _file_util_fstat(void *file_descriptor, struct stat *file_attributes)
260331
{
261332
mcl_error_t return_code = MCL_FAIL;
@@ -281,3 +352,4 @@ static mcl_error_t _file_util_fstat(void *file_descriptor, struct stat *file_att
281352
MCL_DEBUG_LEAVE("retVal = <%d>", return_code);
282353
return return_code;
283354
}
355+
#endif

‎mcl_core/src/http_client/basic/http_client_basic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static const char transfer_encoding_header[] = "Transfer-Encoding: chunked";
2525

2626
#define TLS_DEFAULT_PORT 443
2727
#define HTTP_CALLBACK_BUFFER_SIZE 1024
28-
#define HTTP_PARSE_BUFFER_SIZE 1024
28+
#define HTTP_PARSE_BUFFER_SIZE 2048
2929
#define SIZE_OF_STRING(x) (sizeof(x) - MCL_NULL_CHAR_SIZE)
3030

3131
#define TO_STRING_HELPER(x) (#x)

0 commit comments

Comments
 (0)