projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add demo application.
[bertos.git]
/
cfg
/
os.h
diff --git
a/cfg/os.h
b/cfg/os.h
index 320afdd5f518d3f4973ed7c032a22c649471ce99..c3e943bc45dc2f52fa72cc749435dd142c7d6a37 100755
(executable)
--- a/
cfg/os.h
+++ b/
cfg/os.h
@@
-14,6
+14,15
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.8 2006/02/23 09:09:28 bernie
+ *#* Remove Linux specific hack.
+ *#*
+ *#* Revision 1.7 2006/02/20 01:46:59 bernie
+ *#* Port to MacOSX.
+ *#*
+ *#* Revision 1.6 2006/02/15 09:12:33 bernie
+ *#* Don't mask useful user signals on UNIX.
+ *#*
*#* Revision 1.5 2005/11/27 23:32:42 bernie
*#* Add CPU fallback for OS_ID.
*#*
*#* Revision 1.5 2005/11/27 23:32:42 bernie
*#* Add CPU fallback for OS_ID.
*#*
@@
-50,7
+59,7
@@
#define OS_WIN32 0
#endif
#define OS_WIN32 0
#endif
-#if
def __unix__
+#if
defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#define OS_UNIX 1
#define OS_POSIX 1 /* Not strictly UNIX, but no way to autodetect it. */
#define OS_ID posix
#define OS_UNIX 1
#define OS_POSIX 1 /* Not strictly UNIX, but no way to autodetect it. */
#define OS_ID posix
@@
-58,28
+67,35
@@
/*
* The POSIX moral equivalent of disabling IRQs is disabling signals.
*/
/*
* The POSIX moral equivalent of disabling IRQs is disabling signals.
*/
- #define _XOPEN_SOURCE 600 /* Avoid BSDish stuff */
- #undef _GNU_SOURCE /* This implies _BSD_SOURCE and is predefined on Linux. */
#include <signal.h>
typedef sigset_t cpuflags_t;
#include <signal.h>
typedef sigset_t cpuflags_t;
+
+ #define SET_ALL_SIGNALS(sigs) \
+ do { \
+ sigfillset(&sigs); \
+ sigdelset(&sigs, SIGINT); \
+ sigdelset(&sigs, SIGSTOP); \
+ sigdelset(&sigs, SIGCONT); \
+ } while(0)
+
#define IRQ_DISABLE \
do { \
sigset_t sigs; \
#define IRQ_DISABLE \
do { \
sigset_t sigs; \
-
sigfillset(&
sigs); \
+
SET_ALL_SIGNALS(
sigs); \
sigprocmask(SIG_BLOCK, &sigs, NULL); \
} while (0)
#define IRQ_ENABLE \
do { \
sigset_t sigs; \
sigprocmask(SIG_BLOCK, &sigs, NULL); \
} while (0)
#define IRQ_ENABLE \
do { \
sigset_t sigs; \
-
sigemptyset(&
sigs); \
+
SET_ALL_SIGNALS(
sigs); \
sigprocmask(SIG_UNBLOCK, &sigs, NULL); \
} while (0)
#define IRQ_SAVE_DISABLE(old_sigs) \
do { \
sigset_t sigs; \
sigprocmask(SIG_UNBLOCK, &sigs, NULL); \
} while (0)
#define IRQ_SAVE_DISABLE(old_sigs) \
do { \
sigset_t sigs; \
-
sigemptyset(&
sigs); \
+
SET_ALL_SIGNALS(
sigs); \
sigprocmask(SIG_BLOCK, &sigs, &old_sigs); \
} while (0)
sigprocmask(SIG_BLOCK, &sigs, &old_sigs); \
} while (0)
@@
-120,7
+136,7
@@
* Summarize hosted environments as OS_HOSTED and embedded
* environment with OS_EMBEDDED.
*/
* Summarize hosted environments as OS_HOSTED and embedded
* environment with OS_EMBEDDED.
*/
-#if OS_WIN32 || OS_UNIX
+#if OS_WIN32 || OS_UNIX
|| OS_DARWIN
#define OS_HOSTED 1
#define OS_EMBEDDED 0
#else
#define OS_HOSTED 1
#define OS_EMBEDDED 0
#else