Remove Linux specific hack.

[bertos.git] / cfg / os.h

diff --git a/cfg/os.h b/cfg/os.h
index 041650400fe91b0f3e7b55bbdf2c504bc774032d..c3e943bc45dc2f52fa72cc749435dd142c7d6a37 100755 (executable)
--- a/cfg/os.h
+++ b/cfg/os.h
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $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.4  2005/11/27 03:07:13  bernie
+ *#* IRQ_SAVE_DISABLE(): Really block signals.
+ *#*
  *#* Revision 1.3  2005/11/27 03:02:40  bernie
  *#* Add POSIX emulation for IRQ_* macros; Add Qt support.
  *#*
@@ -44,7 +59,7 @@
        #define OS_WIN32  0
 #endif
 
-#ifdef __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
@@ -52,29 +67,36 @@
        /*
         * 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;
+
+       #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; \
-               sigfillset(&sigs); \
+               SET_ALL_SIGNALS(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; \
-               sigemptyset(&sigs); \
-               sigprocmask(SIG_SETMASK, &sigs, &old_sigs); \
+               SET_ALL_SIGNALS(sigs); \
+               sigprocmask(SIG_BLOCK, &sigs, &old_sigs); \
        } while (0)
 
        #define IRQ_RESTORE(old_sigs) \
@@ -110,18 +132,19 @@
        #define OS_QT 0
 #endif
 
-
-
 /*
  * 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   0
        #define OS_EMBEDDED 1
+
+       /* Embedded environments fall back to CPU-specific code. */
+       #define OS_ID       CPU_ID
 #endif
 
 /* Self-check for the detection */