2 files changed, 15 insertions, 3 deletions

diff --git a/include/color_shm.h b/include/color_shm.h
index a95ffde..f6ad8a5 100644
--- a/include/color_shm.h
+++ b/include/color_shm.h
@@ -1,13 +1,13 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#define SHM_MAJOR               240
+#define SHM_MAJOR               (240)
 
-struct ioctl_cmd {
+struct color_ioctl_cmd {
         unsigned int color;
         unsigned int bank;
 };
 
 #define SET_COLOR_SHM_CMD \
-        _IOW(SHM_MAJOR, 0x1, struct ioctl_cmd)
+        _IOW(SHM_MAJOR, 0x1, struct color_ioctl_cmd)
 
diff --git a/include/litmus.h b/include/litmus.h
index e96a4a6..aaa8d1c 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -148,6 +148,12 @@ int sporadic_clustered(lt_t e_ns, lt_t p_ns, int cluster);
 /** Convert microseconds to nanoseconds
   * @param us Time units in microseconds */
 #define us2ns(us) ((us)*1000LL)
+#define ns2s(ns)  ((ns)/1000000000LL)
+#define ns2ms(ns) ((ns)/1000000LL)
+#define ns2us(ns) ((ns)/1000LL)
+#define us2ms(us) ((us)/1000LL)
+#define us2s(us)  ((us)/1000000LL)
+#define ms2s(ms)  ((ms)/1000LL)
 
 /**
  * Locking protocols for allocated shared objects
@@ -288,6 +294,12 @@ void exit_np(void);
  */
 int  requested_to_preempt(void);
 
+/* pgm support */
+void enter_pgm_wait(void);
+void exit_pgm_wait(void);
+void enter_pgm_send(void);
+void exit_pgm_send(void);
+
 /***** Task System support *****/
 /**
  * Wait until task master releases all real-time tasks