diff options
| -rw-r--r-- | doc/hal/Doxyfile_chm | 2 | ||||
| -rw-r--r-- | doc/hal/Doxyfile_html | 2 | ||||
| -rw-r--r-- | os/hal/include/hal.h | 6 | ||||
| -rw-r--r-- | os/hal/lib/streams/chprintf.c | 10 | ||||
| -rw-r--r-- | readme.txt | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/doc/hal/Doxyfile_chm b/doc/hal/Doxyfile_chm index 5dad53416..f3db17881 100644 --- a/doc/hal/Doxyfile_chm +++ b/doc/hal/Doxyfile_chm @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.1.0
+PROJECT_NUMBER = 4.0.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/hal/Doxyfile_html b/doc/hal/Doxyfile_html index eda1fac78..9fe01d526 100644 --- a/doc/hal/Doxyfile_html +++ b/doc/hal/Doxyfile_html @@ -38,7 +38,7 @@ PROJECT_NAME = ChibiOS/HAL # could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 3.1.0
+PROJECT_NUMBER = 4.0.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/os/hal/include/hal.h b/os/hal/include/hal.h index 48d0a4031..b030ae7ae 100644 --- a/os/hal/include/hal.h +++ b/os/hal/include/hal.h @@ -103,17 +103,17 @@ /**
* @brief HAL version string.
*/
-#define HAL_VERSION "3.1.0dev"
+#define HAL_VERSION "4.0.0dev"
/**
* @brief HAL version major number.
*/
-#define CH_HAL_MAJOR 3
+#define CH_HAL_MAJOR 4
/**
* @brief HAL version minor number.
*/
-#define CH_HAL_MINOR 1
+#define CH_HAL_MINOR 0
/**
* @brief HAL version patch number.
diff --git a/os/hal/lib/streams/chprintf.c b/os/hal/lib/streams/chprintf.c index fa2b105a4..99fea6a09 100644 --- a/os/hal/lib/streams/chprintf.c +++ b/os/hal/lib/streams/chprintf.c @@ -136,7 +136,7 @@ int chvprintf(BaseSequentialStream *chp, const char *fmt, va_list ap) { if (c == 0)
return n;
if (c != '%') {
- chSequentialStreamPut(chp, (uint8_t)c);
+ streamPut(chp, (uint8_t)c);
n++;
continue;
}
@@ -254,22 +254,22 @@ unsigned_common: width = -width;
if (width < 0) {
if (*s == '-' && filler == '0') {
- chSequentialStreamPut(chp, (uint8_t)*s++);
+ streamPut(chp, (uint8_t)*s++);
n++;
i--;
}
do {
- chSequentialStreamPut(chp, (uint8_t)filler);
+ streamPut(chp, (uint8_t)filler);
n++;
} while (++width != 0);
}
while (--i >= 0) {
- chSequentialStreamPut(chp, (uint8_t)*s++);
+ streamPut(chp, (uint8_t)*s++);
n++;
}
while (width) {
- chSequentialStreamPut(chp, (uint8_t)filler);
+ streamPut(chp, (uint8_t)filler);
n++;
width--;
}
diff --git a/readme.txt b/readme.txt index a424c2d0f..490651eee 100644 --- a/readme.txt +++ b/readme.txt @@ -142,6 +142,8 @@ - HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC,
STM32F098xx devices.
+- HAL: Fixed chprintf() still calling RT functions (bug #684)(backported
+ to 3.0.5).
- HAL: Fixed STM32 ICU driver uses chSysLock and chSysUnlock (bug #681)
(backported to 3.0.4).
- HAL: Fixed wrong DMA priority assigned to STM32F3 ADC3&4 (bug #680)
|