Changeset 521

Timestamp:

Jul 21, 2010, 7:13:21 PM (15 years ago)

Author:

David Azarewicz

Message:

Debug statement cleanup

Location:

GPL/trunk

Files:

• alsa-kernel/include/sound/config.h (modified) (1 diff)
• alsa-kernel/pci/hda/hda_hwdep.c (modified) (1 diff)
• drv32/strategy.c (modified) (3 diffs)
• include/dbgos2.h (modified) (1 diff)
• lib32/misc.c (modified) (1 diff)
• lib32/ossidc.cpp (modified) (3 diffs)
• uniaud.inc (modified) (1 diff)

GPL/trunk/alsa-kernel/include/sound/config.h

@@ -83 +83 @@
 #define CONFIG_PM
 #define CONFIG_PROC_FS
+#ifdef DEBUG
 #define CONFIG_SND_DEBUG_DETECT
 #define CONFIG_SND_DEBUG_VERBOSE
+#endif
 #define CONFIG_SND_DMA_SGBUF
 #define CONFIG_SND_HDA_CODEC_ANALOG

GPL/trunk/alsa-kernel/pci/hda/hda_hwdep.c

@@ -99 +99 @@
 {
 #ifndef CONFIG_SND_DEBUG_VERBOSE
-        if (!capable(CAP_SYS_RAWIO))
-                return -EACCES;
+//      if (!capable(CAP_SYS_RAWIO))
+//              return -EACCES;
 #endif
         return 0;

GPL/trunk/drv32/strategy.c

@@ -70 +70 @@
         RPInit __far* rp = (RPInit __far*)_rp;
         rc = DiscardableInit(rp);
-        dprintf(("StratInit End rc=%d", rc));
+        //dprintf(("StratInit End rc=%d", rc));
         return rc;
 }
@@ -119 +119 @@
 #endif
 //PS++ End
-        dprintf(("StratInitComplete"));
-  return(RPDONE);
+        //dprintf(("StratInitComplete"));
+        return(RPDONE);
 }
 //******************************************************************************
@@ -130 +130 @@
         RPShutdown __far *rp = (RPShutdown __far *)_rp;
 
-        dprintf(("StratShutdown Start %d", rp->Function));
+        //dprintf(("StratShutdown %d", rp->Function));
         if(rp->Function == 1) {//end of shutdown
                 OSS32_Shutdown();
         }
-        dprintf(("StratShutdown End"));
-  return(RPDONE);
+        return(RPDONE);
 }
 //******************************************************************************

GPL/trunk/include/dbgos2.h

@@ -32 +32 @@
 extern int wrOffset;
 extern char *szprintBuf;
-//void _cdecl DPE(char *x, ...) ; /* not debugging: nothing */
 int _cdecl printk(const char * fmt, ...);
 #ifdef __cplusplus

GPL/trunk/lib32/misc.c

@@ -409 +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;
-}
+

GPL/trunk/lib32/ossidc.cpp

@@ -162 +162 @@
                         FillCaps(i);
                 }
-                dprintf(("OSS32_Initialize: SUCCESS. Cards=%d", nrCardsDetected));
+                rprintf(("OSS32_Initialize: SUCCESS. Cards=%d", nrCardsDetected));
                 return OSSERR_SUCCESS;
         }
@@ -173 +173 @@
 OSSRET OSS32_Shutdown()
 {
-        dprintf(("OSS32_Shutdown 1"));
         CallOSS16(IDC16_EXIT, 0, 0);
-        dprintf(("OSS32_Shutdown 2"));
 
         for(int i=0;i<nrCardsDetected;i++) {
@@ -181 +179 @@
         }
 
-        dprintf(("OSS32_Shutdown 3"));
         call_module_exit(alsa_mpu401_uart_exit);
-        dprintf(("OSS32_Shutdown 4"));
         call_module_exit(alsa_opl3_seq_exit);
-        dprintf(("OSS32_Shutdown 5"));
         call_module_exit(alsa_opl3_exit);
-        dprintf(("OSS32_Shutdown 6"));
         call_module_exit(alsa_seq_exit);
-        dprintf(("OSS32_Shutdown 7"));
         call_module_exit(alsa_rawmidi_exit);
-        dprintf(("OSS32_Shutdown 8"));
         call_module_exit(alsa_timer_exit);
-        dprintf(("OSS32_Shutdown 9"));
         call_module_exit(alsa_hwdep_exit);
-        dprintf(("OSS32_Shutdown 10"));
         call_module_exit(alsa_pcm_exit);
-        dprintf(("OSS32_Shutdown 11"));
         call_module_exit(alsa_sound_exit);
-        dprintf(("OSS32_Shutdown 12"));
 
         return OSSERR_SUCCESS;

GPL/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r518
+FIXPACK = SVN r520
 
 # ALSA BUILD VERSION