Changeset 518 for GPL/trunk/lib32/misc.c

Timestamp:

Jul 20, 2010, 5:46:55 PM (15 years ago)

Author:

David Azarewicz

Message:

Some of my updates from the 2.1.x branch

File:

• GPL/trunk/lib32/misc.c (modified) (3 diffs)

GPL/trunk/lib32/misc.c

@@ -40 +40 @@
 #include <dbgos2.h>
 
+void StringOut(char *DbgStr);
+
 struct new_utsname system_utsname = {0};
 struct resource ioport_resource = {NULL, 0, 0, IORESOURCE_IO, NULL, NULL, NULL};
@@ -75 +77 @@
     }
 
-    dprintf( (pszLastALSAError) );
+        StringOut(pszLastALSAError);
+//    rprintf( (pszLastALSAError) );
     if(++iLastError > 1) {
         iLastError = 0;
@@ -406 +409 @@
 //******************************************************************************
 //******************************************************************************
+#define del_timer_sync(t) del_timer(t) /* FIXME: not quite correct on SMP */
+int cancel_delayed_work(struct delayed_work *dwork)
+{
+        struct work_struct *work = &dwork->work;
+        int ret;
+
+        ret = del_timer_sync(&work->timer);
+        if (ret)
+                clear_bit(0, &work->pending);
+        return ret;
+}
+//******************************************************************************
+//******************************************************************************
+int schedule_work(struct work_struct *works)
+{
+#ifndef TARGET_OS2
+        return kernel_thread(work_caller, works, 0) >= 0;
+#else
+        return 1;
+#endif
+}
+//******************************************************************************
+//******************************************************************************
+static void delayed_work_timer_fn(unsigned long __data)
+{
+        struct work_struct *work = (struct work_struct *)__data;
+        struct workqueue_struct *wq = work->wq_data;
+        
+        if (wq)
+                __x_queue_work(wq, work);
+        else
+                schedule_work(work);
+}
+//******************************************************************************
+//******************************************************************************
+int queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork, unsigned long delay)
+{
+        struct work_struct *work = &dwork->work;
+        struct timer_list *timer = &work->timer;
+
+        if (!test_and_set_bit(0, &work->pending)) {
+                work->wq_data = wq;
+                timer->expires = jiffies + delay;
+                timer->data = (unsigned long)work;
+                timer->function = delayed_work_timer_fn;
+                add_timer(timer);
+                return 1;
+        }
+        return 0;
+}
+//******************************************************************************
+//******************************************************************************
+/* Greatest common divisor */
+unsigned long gcd(unsigned long a, unsigned long b)
+{
+        unsigned long r;
+        if (a < b) {
+                r = a;
+                a = b;
+                b = r;
+        }
+        while ((r = a % b) != 0) {
+                a = b;
+                b = r;
+        }
+        return b;
+}
+
+//******************************************************************************
+//******************************************************************************
+int strict_strtoul(const char *cp, unsigned int base, unsigned long *res)
+{
+        char *tail;
+        unsigned long val;
+        size_t len;
+
+        *res = 0;
+        len = strlen(cp);
+        if (len == 0)
+                return -EINVAL;
+
+        val = simple_strtoul(cp, &tail, base);
+        if (tail == cp)
+                return -EINVAL;
+
+        if ((*tail == '\0') ||
+                ((len == (size_t)(tail - cp) + 1) && (*tail == '\n'))) {
+                *res = val;
+                return 0;
+        }
+
+        return -EINVAL;
+}