WebSVN – Kolibri OS – Path Comparison – / – /drivers/ddk/ Rev 4291 and /drivers/ddk/ Rev 4292

Regard whitespace Rev 4291 → Rev 4292

 /drivers/ddk/debug/dbglog.c
 ,15 → 135,17
     if( len )
     {
-        SysMsgBoardStr(txtbuf);
+        if( dbgfile.path)
+        {
 /*  do not write into log file if interrupts disabled */
-        if ( (get_eflags() & (1 << 9)) && dbgfile.path)
+            if ( get_eflags() & (1 << 9) )
         {
             write_file(dbgfile.path,txtbuf,dbgfile.offset,len,&writes);
             dbgfile.offset+=writes;
         };
+        }
+        else SysMsgBoardStr(txtbuf);
     };
     return len;
 }

 /drivers/ddk/linux/workqueue.c
 ,6 → 104,51
     return queue_delayed_work(system_wq, dwork, delay);
 }
+bool mod_delayed_work(struct workqueue_struct *wq,
+                                    struct delayed_work *dwork,
+                                    unsigned long delay)
+{
+    return queue_delayed_work(wq, dwork, delay);
+}
+int del_timer(struct timer_list *timer)
+{
+    int ret = 0;
+    if(timer->handle)
+    {
+        CancelTimerHS(timer->handle);
+        timer->handle = 0;
+        ret = 1;
+    };
+    return ret;
+};
+bool cancel_work_sync(struct work_struct *work)
+{
+    unsigned long flags;
+    int ret = 0;
+    spin_lock_irqsave(&system_wq->lock, flags);
+    if(!list_empty(&work->entry))
+    {
+        list_del(&work->entry);
+        ret = 1;
+    };
+    spin_unlock_irqrestore(&system_wq->lock, flags);
+    return ret;
+}
+bool cancel_delayed_work(struct delayed_work *dwork)
+{
+    return cancel_work_sync(&dwork->work);
+}
+bool cancel_delayed_work_sync(struct delayed_work *dwork)
+{
+    return cancel_work_sync(&dwork->work);
+}
 int mod_timer(struct timer_list *timer, unsigned long expires)
 {
     int ret = 0;