From 10bab0a26b3cebfa44b5c73b659217ee29ca120e Mon Sep 17 00:00:00 2001
From: Terraneo Federico <fede.tft@hotmail.it>
Date: Mon, 3 Dec 2012 23:33:44 +0100
Subject: [PATCH] Fixed usleep, added .gitignore
---
.gitignore | 14 ++++++++++++++
miosix/doc/textdoc/Changelog.txt | 2 ++
miosix/kernel/unistd.cpp | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..43b7af14
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# Exclude doxygen
+miosix/doc/doxygen/*
+
+# Exclude temporary files
+main.elf
+main.bin
+main.hex
+main.map
+*.o
+*.a
+
+# Exclude Mac OS X temporary
+._*
+.DS_Store
diff --git a/miosix/doc/textdoc/Changelog.txt b/miosix/doc/textdoc/Changelog.txt
index fbf50d41..4ca8d9d1 100644
--- a/miosix/doc/textdoc/Changelog.txt
+++ b/miosix/doc/textdoc/Changelog.txt
@@ -1,6 +1,8 @@
Changelog for Miosix np embedded OS
v1.61
+- Added .gitignore
+- Fixed a bug in usleep() occurring when its argument assumes the 1000 value
- Improved Lcd44780 driver
- Improved bitsboard driver
- Added prliminary version of the event API to allow asynchronous programming.
diff --git a/miosix/kernel/unistd.cpp b/miosix/kernel/unistd.cpp
index 77f3fdc8..8829aa7b 100644
--- a/miosix/kernel/unistd.cpp
+++ b/miosix/kernel/unistd.cpp
@@ -54,7 +54,7 @@ unsigned int sleep(unsigned int __seconds)
*/
int usleep(useconds_t __useconds)
{
- if(__useconds>1000) Thread::sleep(__useconds / 1000);
+ if(__useconds>=1000) Thread::sleep(__useconds / 1000);
delayUs(__useconds % 1000);
return 0;
}
--
GitLab