sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

consolidate print* in a single header 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-12-19 14:57:10 +01:00 committed by Sascha Hauer
parent 4dd9fc8106
commit b537a772c2
3 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/common.h
View File

@ -29,6 +29,7 @@
#include <linux/kernel.h>
#include <linux/stddef.h>
#include <asm/common.h>
#include <printk.h>
/*
* sanity check. The Linux Kernel defines only one of __LITTLE_ENDIAN and
@ -48,22 +49,6 @@
#error "None of __LITTLE_ENDIAN and __BIG_ENDIAN are defined"
#endif
#define pr_info(fmt, arg...) printf(fmt, ##arg)
#define pr_notice(fmt, arg...) printf(fmt, ##arg)
#define pr_err(fmt, arg...) printf(fmt, ##arg)
#define pr_warning(fmt, arg...) printf(fmt, ##arg)
#define pr_crit(fmt, arg...) printf(fmt, ##arg)
#define pr_alert(fmt, arg...) printf(fmt, ##arg)
#define pr_emerg(fmt, arg...) printf(fmt, ##arg)
#ifdef DEBUG
#define pr_debug(fmt, arg...) printf(fmt, ##arg)
#else
#define pr_debug(fmt, arg...) do {} while(0)
#endif
#define debug(fmt, arg...) pr_debug(fmt, ##arg)
#define BUG() do { \
printf("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \
panic("BUG!"); \

29
include/driver.h
View File

@ -358,35 +358,6 @@ static inline int dev_close_default(struct device_d *dev, struct filep *f)
return 0;
}
/* debugging and troubleshooting/diagnostic helpers. */
int dev_printf(const struct device_d *dev, const char *format, ...)
__attribute__ ((format(__printf__, 2, 3)));
#define dev_emerg(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_alert(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_crit(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_err(dev, format, arg...) \
dev_printf(dev , format , ## arg)
#define dev_warn(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_notice(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_info(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#if defined(DEBUG)
#define dev_dbg(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#else
#define dev_dbg(dev, format, arg...) \
({ if (0) dev_printf((dev), format, ##arg); 0; })
#endif
struct bus_type {
char *name;
int (*match)(struct device_d *dev, struct driver_d *drv);

58
include/printk.h Normal file
View File

@ -0,0 +1,58 @@
#ifndef __PRINTK_H
#define __PRINTK_H
#define MSG_EMERG 0 /* system is unusable */
#define MSG_ALERT 1 /* action must be taken immediately */
#define MSG_CRIT 2 /* critical conditions */
#define MSG_ERR 3 /* error conditions */
#define MSG_WARNING 4 /* warning conditions */
#define MSG_NOTICE 5 /* normal but significant condition */
#define MSG_INFO 6 /* informational */
#define MSG_DEBUG 7 /* debug-level messages */
/* debugging and troubleshooting/diagnostic helpers. */
int dev_printf(const struct device_d *dev, const char *format, ...)
__attribute__ ((format(__printf__, 2, 3)));
#define dev_emerg(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_alert(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_crit(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_err(dev, format, arg...) \
dev_printf(dev , format , ## arg)
#define dev_warn(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_notice(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#define dev_info(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#if defined(DEBUG)
#define dev_dbg(dev, format, arg...) \
dev_printf((dev) , format , ## arg)
#else
#define dev_dbg(dev, format, arg...) \
({ if (0) dev_printf((dev), format, ##arg); 0; })
#endif
#define pr_info(fmt, arg...) printk(fmt, ##arg)
#define pr_notice(fmt, arg...) printk(fmt, ##arg)
#define pr_err(fmt, arg...) printk(fmt, ##arg)
#define pr_warning(fmt, arg...) printk(fmt, ##arg)
#define pr_crit(fmt, arg...) printk(fmt, ##arg)
#define pr_alert(fmt, arg...) printk(fmt, ##arg)
#define pr_emerg(fmt, arg...) printk(fmt, ##arg)
#ifdef DEBUG
#define pr_debug(fmt, arg...) printk(fmt, ##arg)
#define debug(fmt, arg...) printf(fmt, ##arg)
#else
#define pr_debug(fmt, arg...) do {} while(0)
#define debug(fmt, arg...) do {} while(0)
#endif
#endif