Changeset 518 for GPL/trunk/include

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

Location:

GPL/trunk/include

Files:

• dbgos2.h (modified) (1 diff)
• proto.h (modified) (1 diff)
• unicard.h (modified) (1 diff)

GPL/trunk/include/dbgos2.h

@@ -32 +32 @@
 extern int wrOffset;
 extern char *szprintBuf;
-//void _cdecl DPD(int level, char *x, ...) ; /* not debugging: nothing */
-void _cdecl DPE(char *x, ...) ; /* not debugging: nothing */
+//void _cdecl DPE(char *x, ...) ; /* not debugging: nothing */
+int _cdecl printk(const char * fmt, ...);
 #ifdef __cplusplus
 }
 #endif
 
+
 /* rprintf always prints to the log buffer, and to SIO if enabled */
-#define rprintf(a) DPE a
+#define rprintf(a) printk a
 
 /* the dprintf functions only print if DEBUG is defined */
 #ifdef DEBUG
 #define DBG_MAX_BUF_SIZE 0x100000
-#define dprintf(a)      DPE a
-#define dprintf1(a)     if(DebugLevel > 0) DPE a
-#define dprintf2(a)     if(DebugLevel > 1) DPE a
-#define dprintf3(a)     if(DebugLevel > 2) DPE a
+#define dprintf(a)      printk a
+#define dprintf1(a)     if(DebugLevel > 0) printk a
+#define dprintf2(a)     if(DebugLevel > 1) printk a
+#define dprintf3(a)     if(DebugLevel > 2) printk a
 #define DebugInt3()     ; //_asm int 3
 //#define DebInt3()     _asm int 3;

GPL/trunk/include/proto.h

@@ -4 +4 @@
 extern int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params, snd_pcm_hw_param_t var, unsigned int val, int dir);
 extern int in_interrupt(void);
+extern int in_atomic(void);
 /*
  * Uniaud API support

GPL/trunk/include/unicard.h

@@ -51 +51 @@
 #define CARD_CS5535     21
 
-#define CARDS_NUM       21
+#define CARDS_NUM       22
 
 #define CARD_STRING_SBLIVE      "SBLIVE"