Skip to content

Commit ec7e232

Browse files
committed
Remove references of minimal-printf-enable-file-stream
1 parent fa37b20 commit ec7e232

File tree

6 files changed

+3
-29
lines changed

6 files changed

+3
-29
lines changed

TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ int mbed_vsnprintf(char *buffer, size_t length, const char *format, va_list argu
4949
return mbed_minimal_formatted_string(buffer, length, format, arguments, NULL);
5050
}
5151

52-
#if MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FILE_STREAM
5352
int mbed_fprintf(FILE *stream, const char *format, ...)
5453
{
5554
va_list arguments;
@@ -64,4 +63,3 @@ int mbed_vfprintf(FILE *stream, const char *format, va_list arguments)
6463
{
6564
return mbed_minimal_formatted_string(NULL, LONG_MAX, format, arguments, stream);
6665
}
67-
#endif

TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ int mbed_vprintf(const char *format, va_list arguments);
5252
*/
5353
int mbed_vsnprintf(char *buffer, size_t length, const char *format, va_list arguments);
5454

55-
#if MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FILE_STREAM
5655
/**
5756
* Minimal fprintf
5857
*
@@ -66,7 +65,6 @@ int mbed_fprintf(FILE *stream, const char *format, ...);
6665
* Prints directly to file stream without using malloc.
6766
*/
6867
int mbed_vfprintf(FILE *stream, const char *format, va_list arguments);
69-
#endif
7068

7169
#ifdef __cplusplus
7270
}

TESTS/mbed_platform/minimal-printf/compliance/test_app.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

platform/mbed_lib.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@
132132
"help": "Enable printing 64 bit integers when using mprintf profile",
133133
"value": true
134134
},
135-
"minimal-printf-enable-file-stream": {
136-
"help": "Enable printing to a FILE stream when using mprintf profile",
137-
"value": true
138-
},
139135
"minimal-printf-enable-floating-point": {
140136
"help": "Enable floating point printing when using mprintf profile",
141137
"value": true

platform/source/minimal-printf/README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,14 @@ Floating point limitations:
3131

3232
Minimal printf is configured by the following parameters defined in `platform/mbed_lib.json`:
3333

34-
```
34+
```json
3535
{
3636
"name": "platform",
3737
"config": {
3838
"minimal-printf-enable-64-bit": {
3939
"help": "Enable printing 64 bit integers when using minimal-printf profile",
4040
"value": true
4141
},
42-
"minimal-printf-enable-file-stream": {
43-
"help": "Enable printing to a FILE stream when using minimal-printf profile",
44-
"value": true
45-
},
4642
"minimal-printf-enable-floating-point": {
4743
"help": "Enable floating point printing when using minimal-printf profile",
4844
"value": true
@@ -61,10 +57,9 @@ If your target does not require some options then you can override the default c
6157

6258
In mbed_app.json:
6359

64-
```
60+
```json
6561
"target_overrides": {
6662
"*": {
67-
"platform.minimal-printf-enable-file-stream": false,
6863
"platform.minimal-printf-enable-floating-point": false,
6964
"platform.minimal-printf-set-floating-point-max-decimals": 6,
7065
"platform.minimal-printf-enable-64-bit": false

platform/source/minimal-printf/mbed_printf_wrapper.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@
3434
#define SUB_VSPRINTF __wrap_vsprintf
3535
#define SUPER_VSNPRINTF __real_vsnprintf
3636
#define SUB_VSNPRINTF __wrap_vsnprintf
37-
#if MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FILE_STREAM
3837
#define SUPER_FPRINTF __real_fprintf
3938
#define SUB_FPRINTF __wrap_fprintf
4039
#define SUPER_VFPRINTF __real_vfprintf
4140
#define SUB_VFPRINTF __wrap_vfprintf
42-
#endif
4341
#elif defined(TOOLCHAIN_ARM) /* ARMC5/ARMC6 */\
4442
|| defined(__ICCARM__) /* IAR */
4543
#define SUPER_PRINTF $Super$$printf
@@ -54,12 +52,10 @@
5452
#define SUB_VSPRINTF $Sub$$vsprintf
5553
#define SUPER_VSNPRINTF $Super$$vsnprintf
5654
#define SUB_VSNPRINTF $Sub$$vsnprintf
57-
#if MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FILE_STREAM
5855
#define SUPER_FPRINTF $Super$$fprintf
5956
#define SUB_FPRINTF $Sub$$fprintf
6057
#define SUPER_VFPRINTF $Super$$vfprintf
6158
#define SUB_VFPRINTF $Sub$$vfprintf
62-
#endif
6359
#else
6460
#warning "This compiler is not yet supported."
6561
#endif
@@ -109,7 +105,6 @@ int SUB_VSNPRINTF(char *buffer, size_t length, const char *format, va_list argum
109105
return mbed_minimal_formatted_string(buffer, length, format, arguments, NULL);
110106
}
111107

112-
#if MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FILE_STREAM
113108
int SUB_FPRINTF(FILE *stream, const char *format, ...)
114109
{
115110
va_list arguments;
@@ -124,6 +119,5 @@ int SUB_VFPRINTF(FILE *stream, const char *format, va_list arguments)
124119
{
125120
return mbed_minimal_formatted_string(NULL, LONG_MAX, format, arguments, stream);
126121
}
127-
#endif
128122

129-
#endif // MBED_MINIMAL_PRINTF
123+
#endif // MBED_MINIMAL_PRINTF

0 commit comments

Comments
 (0)