⛏️ index : haiku.git

dffebdd68a5c0ee966c40f1bedbfe342bdbcd0b6 [patch]

9ff5024305e603781015b83aec504deb93825a27

772e0a03ef10a1eaf175012c247919671818ef2d

dffebdd68a5c0ee966c40f1bedbfe342bdbcd0b6.tar.gz

Rename some debug_printf functions in drivers

There is a debug_printf function in headers/os/kernel/OS.h that can
conflict with these.

Change-Id: Ic0d4e8169984f5b4df2be8fc3e00b8b55e68d864
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10043
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Reviewed-by: Axel Dörfler <axeld@pinc-software.de>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>

Diff

 src/add-ons/kernel/drivers/audio/echo/debug.c        | 4 ++--
 src/add-ons/kernel/drivers/audio/echo/debug.h        | 8 ++++----
 src/add-ons/kernel/drivers/audio/emuxki/debug.c      | 4 ++--
 src/add-ons/kernel/drivers/audio/emuxki/debug.h      | 8 ++++----
 src/add-ons/kernel/drivers/midi/mpu401/debug.c       | 2 +-
 src/add-ons/kernel/drivers/midi/mpu401/debug.h       | 6 +++---
 src/add-ons/kernel/drivers/audio/ac97/auich/debug.c  | 4 ++--
 src/add-ons/kernel/drivers/audio/ac97/auich/debug.h  | 8 ++++----
 src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c  | 4 ++--
 src/add-ons/kernel/drivers/audio/ac97/auvia/debug.h  | 8 ++++----
 src/add-ons/kernel/drivers/audio/ac97/es1370/debug.c | 4 ++--
 src/add-ons/kernel/drivers/audio/ac97/es1370/debug.h | 8 ++++----
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/add-ons/kernel/drivers/audio/echo/debug.c b/src/add-ons/kernel/drivers/audio/echo/debug.c
index a44b172..289508b 100644
--- a/src/add-ons/kernel/drivers/audio/echo/debug.c
+++ b/src/add-ons/kernel/drivers/audio/echo/debug.c
@@ -48,11 +48,11 @@
#endif


void debug_printf(const char *text,...);
void echo_debug_printf(const char *text,...);
void log_printf(const char *text,...);


void debug_printf(const char *text,...)
void echo_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/audio/echo/debug.h b/src/add-ons/kernel/drivers/audio/echo/debug.h
index eb3cab7..43e7233 100644
--- a/src/add-ons/kernel/drivers/audio/echo/debug.h
+++ b/src/add-ons/kernel/drivers/audio/echo/debug.h
@@ -65,7 +65,7 @@

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		echo_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define ASSERT(a)		if (a) {} else LOG(("ASSERT failed! file = %s, line = %d\n",__FILE__,__LINE__))
@@ -75,7 +75,7 @@

	void log_create(void);
	void log_printf(const char *text,...);
	void debug_printf(const char *text,...);
	void echo_debug_printf(const char *text,...);
#ifdef __cplusplus
}
#endif
@@ -85,11 +85,11 @@
extern "C" {
#endif
	void log_create(void);
	void debug_printf(const char *text,...);
	void echo_debug_printf(const char *text,...);
#ifdef __cplusplus
}
#endif
	#define PRINT(a)	debug_printf a
	#define PRINT(a)	echo_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/debug.c b/src/add-ons/kernel/drivers/audio/emuxki/debug.c
index 9546a5d..badda45 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/debug.c
+++ b/src/add-ons/kernel/drivers/audio/emuxki/debug.c
@@ -49,12 +49,12 @@
#endif


void debug_printf(const char *text,...);
void emuxki_debug_printf(const char *text,...);
void log_printf(const char *text,...);
void log_create(void);


void debug_printf(const char *text,...)
void emuxki_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/audio/emuxki/debug.h b/src/add-ons/kernel/drivers/audio/emuxki/debug.h
index 6e94ed0..7edb43e 100644
--- a/src/add-ons/kernel/drivers/audio/emuxki/debug.h
+++ b/src/add-ons/kernel/drivers/audio/emuxki/debug.h
@@ -51,16 +51,16 @@

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		emuxki_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define ASSERT(a)		if (a) {} else LOG(("ASSERT failed! file = %s, line = %d\n",__FILE__,__LINE__))
	void log_create();
	void log_printf(const char *text,...);
	void debug_printf(const char *text,...);
	void emuxki_debug_printf(const char *text,...);
#else
	void debug_printf(const char *text,...);
	#define PRINT(a)	debug_printf a
	void emuxki_debug_printf(const char *text,...);
	#define PRINT(a)	emuxki_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))
diff --git a/src/add-ons/kernel/drivers/midi/mpu401/debug.c b/src/add-ons/kernel/drivers/midi/mpu401/debug.c
index 71842f1..525becb 100644
--- a/src/add-ons/kernel/drivers/midi/mpu401/debug.c
+++ b/src/add-ons/kernel/drivers/midi/mpu401/debug.c
@@ -44,7 +44,7 @@
#define VERSION "0.2"


void debug_printf(const char *text,...)
void mpu401_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/midi/mpu401/debug.h b/src/add-ons/kernel/drivers/midi/mpu401/debug.h
index 3f3e7f9..6409477 100644
--- a/src/add-ons/kernel/drivers/midi/mpu401/debug.h
+++ b/src/add-ons/kernel/drivers/midi/mpu401/debug.h
@@ -46,11 +46,11 @@
#undef TRACE
#undef ASSERT

void debug_printf(const char *text,...);
void mpu401_debug_printf(const char *text,...);

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		mpu401_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define DEBUG_ONLY(a)	a
@@ -58,7 +58,7 @@
	void log_create(void);
	void log_printf(const char *text,...);
#else
	#define PRINT(a)	debug_printf a
	#define PRINT(a)	mpu401_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/debug.c b/src/add-ons/kernel/drivers/audio/ac97/auich/debug.c
index ce6b53f..4e8ed42 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auich/debug.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auich/debug.c
@@ -50,12 +50,12 @@
#endif


void debug_printf(const char *text,...);
void auich_debug_printf(const char *text,...);
void log_printf(const char *text,...);
void log_create(void);


void debug_printf(const char *text,...)
void auich_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auich/debug.h b/src/add-ons/kernel/drivers/audio/ac97/auich/debug.h
index c52ce07..a6339ee 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auich/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ac97/auich/debug.h
@@ -51,16 +51,16 @@

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		auich_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define ASSERT(a)		if (a) {} else LOG(("ASSERT failed! file = %s, line = %d\n",__FILE__,__LINE__))
	void log_create();
	void log_printf(const char *text,...);
	void debug_printf(const char *text,...);
	void auich_debug_printf(const char *text,...);
#else
	void debug_printf(const char *text,...);
	#define PRINT(a)	debug_printf a
	void auich_debug_printf(const char *text,...);
	#define PRINT(a)	auich_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
index 07bdfb1..f41c36d 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.c
@@ -50,12 +50,12 @@
#endif


void debug_printf(const char *text,...);
void auvia_debug_printf(const char *text,...);
void log_printf(const char *text,...);
void log_create(void);


void debug_printf(const char *text,...)
void auvia_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.h b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.h
index 11bfe59..d0b7511 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ac97/auvia/debug.h
@@ -51,16 +51,16 @@

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		auvia_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define ASSERT(a)		if (a) {} else LOG(("ASSERT failed! file = %s, line = %d\n",__FILE__,__LINE__))
	void log_create();
	void log_printf(const char *text,...);
	void debug_printf(const char *text,...);
	void auvia_debug_printf(const char *text,...);
#else
	void debug_printf(const char *text,...);
	#define PRINT(a)	debug_printf a
	void auvia_debug_printf(const char *text,...);
	#define PRINT(a)	auvia_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))
diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.c b/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.c
index dcc715c..606e37d 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.c
+++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.c
@@ -30,12 +30,12 @@
#endif


void debug_printf(const char *text,...);
void es1370_debug_printf(const char *text,...);
void log_printf(const char *text,...);
void log_create(void);


void debug_printf(const char *text,...)
void es1370_debug_printf(const char *text,...)
{
	char buf[1024];
	va_list ap;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.h b/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.h
index e6b45dd..8c2b988 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ac97/es1370/debug.h
@@ -32,16 +32,16 @@

#if DEBUG > 0

	#define PRINT(a)		log_printf a
	#define TRACE(a) 		debug_printf a
	#define TRACE(a) 		es1370_debug_printf a
	#define LOG(a)			log_printf a
	#define LOG_CREATE()	log_create()
	#define ASSERT(a)		if (a) {} else LOG(("ASSERT failed! file = %s, line = %d\n",__FILE__,__LINE__))
	void log_create();
	void log_printf(const char *text,...);
	void debug_printf(const char *text,...);
	void es1370_debug_printf(const char *text,...);
#else
	void debug_printf(const char *text,...);
	#define PRINT(a)	debug_printf a
	void es1370_debug_printf(const char *text,...);
	#define PRINT(a)	es1370_debug_printf a
	#define TRACE(a)	((void)(0))
	#define ASSERT(a)	((void)(0))
	#define LOG(a)		((void)(0))