[svn-commits] fjoe: freebsd/trunk r8861 - in /freebsd/trunk: drivers/dahdi/ drivers/dahdi/v...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jul 8 06:01:54 CDT 2010
Author: fjoe
Date: Thu Jul 8 06:01:48 2010
New Revision: 8861
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8861
Log:
Emulate THIS_MODULE.
Modified:
freebsd/trunk/drivers/dahdi/dahdi-base.c
freebsd/trunk/drivers/dahdi/dahdi_dynamic.c
freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c
freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c
freebsd/trunk/drivers/dahdi/dahdi_dynamic_loc.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_kb1.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_mg2.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_sec.c
freebsd/trunk/drivers/dahdi/dahdi_echocan_sec2.c
freebsd/trunk/drivers/dahdi/voicebus/voicebus.c
freebsd/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c
freebsd/trunk/drivers/dahdi/wcfxo.c
freebsd/trunk/include/dahdi/compat/bsd.h
Modified: freebsd/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi-base.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi-base.c Thu Jul 8 06:01:48 2010
@@ -50,8 +50,6 @@
#include "version.h"
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-
#define FOP_READ_ARGS_DECL struct file *file, struct uio *uio, size_t count
#define FOP_READ_ARGS file, uio, count
#define FOP_WRITE_ARGS_DECL struct file *file, struct uio *uio, size_t count
@@ -83,14 +81,13 @@
#include <dahdi/version.h>
-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-
#define FOP_READ_ARGS_DECL struct file *file, char __user *usrbuf, size_t count, loff_t *ppos
#define FOP_READ_ARGS file, usrbuf, count, ppos
#define FOP_WRITE_ARGS_DECL struct file *file, const char __user *usrbuf, size_t count, loff_t *ppos
#define FOP_WRITE_ARGS file, usrbuf, count, ppos
-
#endif /* !__FreeBSD__ */
+
+#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
/* #define BUF_MUNGE */
@@ -9314,7 +9311,7 @@
/* Now declare the module to the system */
MODULE_VERSION(dahdi, 1);
-DEV_MODULE(dahdi, dahdi_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi, dahdi_modevent, NULL);
#ifdef CONFIG_DAHDI_CORE_TIMER
MODULE_VERSION(dahdi_dummy, 1);
DEV_MODULE(dahdi_dummy, NULL, NULL);
Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic.c Thu Jul 8 06:01:48 2010
@@ -1018,7 +1018,7 @@
}
}
-DEV_MODULE(dahdi_dynamic, dahdi_dynamic_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_dynamic, dahdi_dynamic_modevent, NULL);
MODULE_VERSION(dahdi_dynamic, 1);
MODULE_DEPEND(dahdi_dynamic, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic_eth.c Thu Jul 8 06:01:48 2010
@@ -516,7 +516,7 @@
}
}
-DEV_MODULE(dahdi_dynamic_eth, dahdi_dynamic_eth_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_dynamic_eth, dahdi_dynamic_eth_modevent, NULL);
MODULE_VERSION(dahdi_dynamic_eth, 1);
MODULE_DEPEND(dahdi_dynamic_eth, dahdi, 1, 1, 1);
MODULE_DEPEND(dahdi_dynamic_eth, dahdi_dynamic, 1, 1, 1);
Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic_ethmf.c Thu Jul 8 06:01:48 2010
@@ -969,7 +969,7 @@
}
}
-DEV_MODULE(dahdi_dynamic_ethmf, dahdi_dynamic_ethmf_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_dynamic_ethmf, dahdi_dynamic_ethmf_modevent, NULL);
MODULE_VERSION(dahdi_dynamic_ethmf, 1);
MODULE_DEPEND(dahdi_dynamic_ethmf, dahdi, 1, 1, 1);
MODULE_DEPEND(dahdi_dynamic_ethmf, dahdi_dynamic, 1, 1, 1);
Modified: freebsd/trunk/drivers/dahdi/dahdi_dynamic_loc.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_dynamic_loc.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_dynamic_loc.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_dynamic_loc.c Thu Jul 8 06:01:48 2010
@@ -282,7 +282,7 @@
}
}
-DEV_MODULE(dahdi_dynamic_loc, dahdi_dynamic_loc_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_dynamic_loc, dahdi_dynamic_loc_modevent, NULL);
MODULE_VERSION(dahdi_dynamic_loc, 1);
MODULE_DEPEND(dahdi_dynamic_loc, dahdi, 1, 1, 1);
MODULE_DEPEND(dahdi_dynamic_loc, dahdi_dynamic, 1, 1, 1);
Modified: freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_echocan_jpah.c Thu Jul 8 06:01:48 2010
@@ -33,9 +33,6 @@
#include <sys/ctype.h>
#include <sys/libkern.h>
#include <sys/module.h>
-
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printf("%s: " fmt, __FUNCTION__, ## args)
#else /* !__FreeBSD__ */
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -43,14 +40,14 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/moduleparam.h>
-
-#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
#endif /* !__FreeBSD__ */
#include <dahdi/kernel.h>
static int debug;
+
+#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
+#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
static int echo_can_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
@@ -172,7 +169,7 @@
}
}
-DEV_MODULE(dahdi_echocan_jpah, echocan_jpah_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_echocan_jpah, echocan_jpah_modevent, NULL);
MODULE_VERSION(dahdi_echocan_jpah, 1);
MODULE_DEPEND(dahdi_echocan_jpah, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/dahdi_echocan_kb1.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_echocan_kb1.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_echocan_kb1.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_echocan_kb1.c Thu Jul 8 06:01:48 2010
@@ -38,9 +38,6 @@
#include <sys/ctype.h>
#include <sys/libkern.h>
#include <sys/module.h>
-
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printf("%s: " fmt, __FUNCTION__, ## args)
#else /* !__FreeBSD__ */
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -49,15 +46,15 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/moduleparam.h>
+#endif /* !__FreeBSD__ */
+
+#include <dahdi/kernel.h>
+
+static int debug;
+static int aggressive;
#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-#endif /* !__FreeBSD__ */
-
-#include <dahdi/kernel.h>
-
-static int debug;
-static int aggressive;
/* Uncomment to provide summary statistics for overall echo can performance every 4000 samples */
/* #define MEC2_STATS 4000 */
@@ -772,7 +769,7 @@
}
}
-DEV_MODULE(dahdi_echocan_kb1, echocan_kb1_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_echocan_kb1, echocan_kb1_modevent, NULL);
MODULE_VERSION(dahdi_echocan_kb1, 1);
MODULE_DEPEND(dahdi_echocan_kb1, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/dahdi_echocan_mg2.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_echocan_mg2.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_echocan_mg2.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_echocan_mg2.c Thu Jul 8 06:01:48 2010
@@ -38,9 +38,6 @@
#include <sys/ctype.h>
#include <sys/libkern.h>
#include <sys/module.h>
-
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printf("%s: " fmt, __FUNCTION__, ## args)
#else /* !__FreeBSD__ */
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -49,15 +46,15 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/moduleparam.h>
+#endif /* !__FreeBSD__ */
+
+#include <dahdi/kernel.h>
+
+static int debug;
+static int aggressive;
#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-#endif /* !__FreeBSD__ */
-
-#include <dahdi/kernel.h>
-
-static int debug;
-static int aggressive;
#define ABS(a) abs(a!=-32768?a:-32767)
@@ -919,7 +916,7 @@
}
}
-DEV_MODULE(dahdi_echocan_mg2, echocan_mg2_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_echocan_mg2, echocan_mg2_modevent, NULL);
MODULE_VERSION(dahdi_echocan_mg2, 1);
MODULE_DEPEND(dahdi_echocan_mg2, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/dahdi_echocan_sec.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_echocan_sec.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_echocan_sec.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_echocan_sec.c Thu Jul 8 06:01:48 2010
@@ -43,9 +43,6 @@
#include <sys/ctype.h>
#include <sys/libkern.h>
#include <sys/module.h>
-
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printf("%s: " fmt, __FUNCTION__, ## args)
#else /* !__FreeBSD__ */
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -54,14 +51,14 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/moduleparam.h>
+#endif /* !__FreeBSD__ */
+
+#include <dahdi/kernel.h>
+
+static int debug;
#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-#endif /* !__FreeBSD__ */
-
-#include <dahdi/kernel.h>
-
-static int debug;
#include "arith.h"
@@ -384,7 +381,7 @@
}
}
-DEV_MODULE(dahdi_echocan_sec, echocan_sec_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_echocan_sec, echocan_sec_modevent, NULL);
MODULE_VERSION(dahdi_echocan_sec, 1);
MODULE_DEPEND(dahdi_echocan_sec, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/dahdi_echocan_sec2.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi_echocan_sec2.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi_echocan_sec2.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi_echocan_sec2.c Thu Jul 8 06:01:48 2010
@@ -42,9 +42,6 @@
#include <sys/ctype.h>
#include <sys/libkern.h>
#include <sys/module.h>
-
-#define module_printk(level, fmt, args...) printf(fmt, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printf("%s: " fmt, __FUNCTION__, ## args)
#else /* !__FreeBSD__ */
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -53,14 +50,14 @@
#include <linux/init.h>
#include <linux/ctype.h>
#include <linux/moduleparam.h>
+#endif /* !__FreeBSD__ */
+
+#include <dahdi/kernel.h>
+
+static int debug;
#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
-#endif /* !__FreeBSD__ */
-
-#include <dahdi/kernel.h>
-
-static int debug;
#include "fir.h"
@@ -379,7 +376,7 @@
}
}
-DEV_MODULE(dahdi_echocan_sec2, echocan_sec2_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_echocan_sec2, echocan_sec2_modevent, NULL);
MODULE_VERSION(dahdi_echocan_sec2, 1);
MODULE_DEPEND(dahdi_echocan_sec2, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
Modified: freebsd/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ freebsd/trunk/drivers/dahdi/voicebus/voicebus.c Thu Jul 8 06:01:48 2010
@@ -2102,7 +2102,7 @@
}
MODULE_VERSION(dahdi_voicebus, 1);
-DEV_MODULE(dahdi_voicebus, dahdi_voicebus_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_voicebus, dahdi_voicebus_modevent, NULL);
MODULE_DEPEND(dahdi_voicebus, dahdi, 1, 1, 1);
#else /* !__FreeBSD__ */
MODULE_DESCRIPTION("Voicebus Interface w/VPMADT032 support");
Modified: freebsd/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c (original)
+++ freebsd/trunk/drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c Thu Jul 8 06:01:48 2010
@@ -206,7 +206,7 @@
}
}
-DEV_MODULE(dahdi_vpmadt032_loader, dahdi_vpmadt032_loader_modevent, NULL);
+DAHDI_DEV_MODULE(dahdi_vpmadt032_loader, dahdi_vpmadt032_loader_modevent, NULL);
MODULE_VERSION(dahdi_vpmadt032_loader, 1);
MODULE_DEPEND(dahdi_vpmadt032_loader, dahdi, 1, 1, 1);
MODULE_DEPEND(dahdi_vpmadt032_loader, dahdi_voicebus, 1, 1, 1);
Modified: freebsd/trunk/drivers/dahdi/wcfxo.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcfxo.c?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcfxo.c (original)
+++ freebsd/trunk/drivers/dahdi/wcfxo.c Thu Jul 8 06:01:48 2010
@@ -122,15 +122,9 @@
#define PEGTIME 50 * 8 /* 50ms peak to peak gets us rings of 10 Hz or more */
#define PEGCOUNT 5 /* 5 cycles of pegging means RING */
-#if defined(__FreeBSD__)
-#define wcfxo_printk(level, span, fmt, ...) \
- printk(KERN_ ## level "%s-%s: %s: " fmt, #level, \
- "wcfxo", (span).name, ## __VA_ARGS__)
-#else
#define wcfxo_printk(level, span, fmt, ...) \
printk(KERN_ ## level "%s-%s: %s: " fmt, #level, \
THIS_MODULE->name, (span).name, ## __VA_ARGS__)
-#endif
#define wcfxo_notice(span, fmt, ...) \
wcfxo_printk(NOTICE, span, fmt, ## __VA_ARGS__)
Modified: freebsd/trunk/include/dahdi/compat/bsd.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/compat/bsd.h?view=diff&rev=8861&r1=8860&r2=8861
==============================================================================
--- freebsd/trunk/include/dahdi/compat/bsd.h (original)
+++ freebsd/trunk/include/dahdi/compat/bsd.h Thu Jul 8 06:01:48 2010
@@ -325,11 +325,21 @@
#define __devexit
#define __devinitdata
-struct module;
-
#define try_module_get(m) (1)
#define module_put(m) ((void) (m))
-#define THIS_MODULE ((struct module *) __FILE__)
+
+struct module {
+ const char *name;
+};
+
+extern struct module _this_module;
+
+#define THIS_MODULE (&_this_module)
+
+#define DAHDI_DEV_MODULE(name, evh, arg) \
+ DEV_MODULE(name, evh, arg); \
+ struct module _this_module = { #name }
+
int request_module(const char *fmt, ...);
#define EXPORT_SYMBOL(s)
More information about the svn-commits
mailing list