diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-20 11:48:16 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-20 11:48:16 +0000 |
| commit | b59b2d79daa1fed66792f6ac44b85766bda16c03 (patch) | |
| tree | 30275ccb0b0ca7ae946199d4a40cc63adcc9837c /os | |
| parent | 59dfc570f292d3305a5681113586708c8a962c79 (diff) | |
| download | ChibiOS-b59b2d79daa1fed66792f6ac44b85766bda16c03.tar.gz ChibiOS-b59b2d79daa1fed66792f6ac44b85766bda16c03.tar.bz2 ChibiOS-b59b2d79daa1fed66792f6ac44b85766bda16c03.zip | |
Fixed bug #684.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8626 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/include/hal.h | 6 | ||||
| -rw-r--r-- | os/hal/lib/streams/chprintf.c | 10 |
2 files changed, 8 insertions, 8 deletions
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--;
}
|