Documentation fixes.

[bertos.git] / cfg / os.h

diff --git a/cfg/os.h b/cfg/os.h
index 636a3fa8b37ea94f7a679d8f717f964bdb8ef358..eb82043ae0d4c6f613e2d220f9fd6a5f8c2afaac 100755 (executable)
--- a/cfg/os.h
+++ b/cfg/os.h
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.9  2006/03/22 13:34:34  bernie
+ *#* MSVC support.
+ *#*
+ *#* 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.
  *#*
@@ -43,11 +58,19 @@
 #ifdef _WIN32
        #define OS_WIN32  1
        #define OS_ID     win32
+
+       // FIXME: Maybe disable Win32 exceptions?
+       typedef int cpuflags_t;
+       #define IRQ_DISABLE                /* FIXME */
+       #define IRQ_ENABLE                 /* FIXME */
+       #define IRQ_SAVE_DISABLE(old_sigs) /* FIXME */
+       #define IRQ_RESTORE(old_sigs)      /* FIXME */
+
 #else
        #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
@@ -55,28 +78,35 @@
        /*
         * 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); \
+               SET_ALL_SIGNALS(sigs); \
                sigprocmask(SIG_BLOCK, &sigs, &old_sigs); \
        } while (0)
 
@@ -113,18 +143,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 */