reflect Robs changes. Thx !

GBert · Dec 1, 2015 · 5d76e9d · 5d76e9d
1 parent d6dfcc1
commit 5d76e9d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 deletions.
diff --git a/rocrail/patch_save/014-rocs_h_code_fix.patch b/rocrail/patch_save/014-rocs_h_code_fix.patch
@@ -0,0 +1,11 @@
+--- a/rocs/public/rocs.h
++++ b/rocs/public/rocs.h
+@@ -55,7 +55,7 @@ typedef enum {True=1,False=0,Yes=1,No=0,
+ #define __ROCS_EVENT__
+ #define __ROCS_LIB__
+ #define __ROCS_MUTEX__
+-#define __ROCS_SERIAL__
++/* #define __ROCS_SERIAL__ */
+ #define __ROCS_SOCKET__
+ #define __ROCS_SYSTEM__
+ #define __ROCS_THREAD__
diff --git a/rocrail/patches/015-linker_fix.patch → rocrail/patch_save/015-linker_fix.patch b/rocrail/patches/015-linker_fix.patch → rocrail/patch_save/015-linker_fix.patch
diff --git a/rocrail/patches/098-mgbox.patch → rocrail/patch_save/098-mgbox.patch b/rocrail/patches/098-mgbox.patch → rocrail/patch_save/098-mgbox.patch
diff --git a/rocrail/patches/099-musl.patch b/rocrail/patches/099-musl.patch
@@ -29,29 +29,3 @@
  #endif
  }
 
---- a/rocs/impl/unx/uthread.c
-+++ b/rocs/impl/unx/uthread.c
-@@ -114,19 +114,19 @@ void rocs_thread_high( iOThread inst ) {
- #if defined __APPLE__
-     /* TODO: apple thread prio */
- #else
--    param.__sched_priority = 10; /* valid range = 1...99*/
-+    param.sched_priority = 10; /* valid range = 1...99*/
-
-     rc = pthread_setschedparam( o->handle, policy, &param );
-     if( rc == 0 )
--      TraceOp.terrno( name, TRCLEVEL_DEBUG, __LINE__, 9999, rc, "Setted thread priority to %d", param.__sched_priority );
-+      TraceOp.terrno( name, TRCLEVEL_DEBUG, __LINE__, 9999, rc, "Setted thread priority to %d", param.sched_priority );
-     else {
--      TraceOp.terrno( name, TRCLEVEL_WARNING, __LINE__, 9999, rc, "Could not set thread priority to %d (only superuser can do this)", param.__sched_priority );
-+      TraceOp.terrno( name, TRCLEVEL_WARNING, __LINE__, 9999, rc, "Could not set thread priority to %d (only superuser can do this)", param.sched_priority );
-     }
-     rc = pthread_getschedparam( o->handle, &policy, &param);
-     if( policy == SCHED_FIFO ) szPolicy = "SCHED_FIFO";
-     else if( policy == SCHED_RR ) szPolicy = "SCHED_RR";
-     else szPolicy = "SCHED_OTHER";
--    TraceOp.terrno( name, TRCLEVEL_INFO, __LINE__, 9999, rc, "Current thread priority is %d policy=%s", param.__sched_priority, szPolicy );
-+    TraceOp.terrno( name, TRCLEVEL_INFO, __LINE__, 9999, rc, "Current thread priority is %d policy=%s", param.sched_priority, szPolicy );
- #endif
-   }
- #endif