Module: xenomai-head
Branch: master
Commit: 15576b3ab67e34050e069327e275d7e5614ee56e
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=15576b3ab67e34050e069327e275d7e5614ee56e
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Thu Jan 27 00:12:10 2011 +0100
testsuite: suppress XENO_DRIVERS_TESTING_LEGACY_NAMES
---
ksrc/drivers/testing/Config.in | 2 --
ksrc/drivers/testing/Kconfig | 9 ---------
ksrc/drivers/testing/irqbench.c | 4 ----
ksrc/drivers/testing/klat.c | 4 ----
ksrc/drivers/testing/switchtest.c | 4 ----
ksrc/drivers/testing/timerbench.c | 4 ----
src/testsuite/irqbench/irqloop.c | 11 +----------
src/testsuite/latency/latency.c | 12 +-----------
src/testsuite/switchtest/switchtest.c | 13 +------------
9 files changed, 3 insertions(+), 60 deletions(-)
diff --git a/ksrc/drivers/testing/Config.in b/ksrc/drivers/testing/Config.in
index 4f81cf9..1ad9cf1 100644
--- a/ksrc/drivers/testing/Config.in
+++ b/ksrc/drivers/testing/Config.in
@@ -5,8 +5,6 @@
mainmenu_option next_comment
comment 'Testing drivers'
-bool 'Use legacy names for testing drivers'
CONFIG_XENO_DRIVERS_TESTING_LEGACY_NAMES $CONFIG_XENO_SKIN_RTDM
-
dep_tristate 'Timer benchmark driver' CONFIG_XENO_DRIVERS_TIMERBENCH
$CONFIG_XENO_SKIN_RTDM
dep_tristate 'IRQ benchmark driver' CONFIG_XENO_DRIVERS_IRQBENCH
$CONFIG_XENO_SKIN_RTDM
diff --git a/ksrc/drivers/testing/Kconfig b/ksrc/drivers/testing/Kconfig
index 28504dc..2228770 100644
--- a/ksrc/drivers/testing/Kconfig
+++ b/ksrc/drivers/testing/Kconfig
@@ -1,14 +1,5 @@
menu "Testing drivers"
-config XENO_DRIVERS_TESTING_LEGACY_NAMES
- depends on XENO_SKIN_RTDM
- bool "Use legacy names for testing drivers"
- help
- This lets the testing drivers register under legacy names
- ("rttest<N>") instead of the new scheme ("rttest-<subclass><N>").
- Only enable this if you plan to use old userspace tools with the
- drivers.
-
config XENO_DRIVERS_TIMERBENCH
depends on XENO_SKIN_RTDM
tristate "Timer benchmark driver"
diff --git a/ksrc/drivers/testing/irqbench.c b/ksrc/drivers/testing/irqbench.c
index ab9686a..583e766 100644
--- a/ksrc/drivers/testing/irqbench.c
+++ b/ksrc/drivers/testing/irqbench.c
@@ -516,11 +516,7 @@ static int __init __irqbench_init(void)
do {
snprintf(device.device_name, RTDM_MAX_DEVNAME_LEN,
-#ifdef CONFIG_XENO_DRIVERS_TESTING_LEGACY_NAMES
- "rttest%d",
-#else
"rttest-irqbench%d",
-#endif
start_index);
err = rtdm_dev_register(&device);
diff --git a/ksrc/drivers/testing/klat.c b/ksrc/drivers/testing/klat.c
index 9e3613e..640ecad 100644
--- a/ksrc/drivers/testing/klat.c
+++ b/ksrc/drivers/testing/klat.c
@@ -100,11 +100,7 @@ static int __init klat_mod_init(void)
for (dev_nr = 0; dev_nr < DEV_NR_MAX; dev_nr++) {
snprintf(devname, sizeof(devname),
-#ifdef CONFIG_XENO_DRIVERS_TESTING_LEGACY_NAMES
- "rttest%d",
-#else
"rttest-timerbench%d",
-#endif
dev_nr);
fd = rt_dev_open(devname, O_RDONLY);
if (fd < 0)
diff --git a/ksrc/drivers/testing/switchtest.c
b/ksrc/drivers/testing/switchtest.c
index e335bfb..7816579 100644
--- a/ksrc/drivers/testing/switchtest.c
+++ b/ksrc/drivers/testing/switchtest.c
@@ -751,11 +751,7 @@ int __init __switchtest_init(void)
do {
snprintf(device.device_name, RTDM_MAX_DEVNAME_LEN,
-#ifdef CONFIG_XENO_DRIVERS_TESTING_LEGACY_NAMES
- "rttest%d",
-#else
"rttest-switchtest%d",
-#endif
start_index);
err = rtdm_dev_register(&device);
diff --git a/ksrc/drivers/testing/timerbench.c
b/ksrc/drivers/testing/timerbench.c
index fcd040d..24c4323 100644
--- a/ksrc/drivers/testing/timerbench.c
+++ b/ksrc/drivers/testing/timerbench.c
@@ -509,11 +509,7 @@ static int __init __timerbench_init(void)
do {
snprintf(device.device_name, RTDM_MAX_DEVNAME_LEN,
-#ifdef CONFIG_XENO_DRIVERS_TESTING_LEGACY_NAMES
- "rttest%d",
-#else
"rttest-timerbench%d",
-#endif
start_index);
err = rtdm_dev_register(&device);
diff --git a/src/testsuite/irqbench/irqloop.c b/src/testsuite/irqbench/irqloop.c
index 9298575..4d0c72d 100644
--- a/src/testsuite/irqbench/irqloop.c
+++ b/src/testsuite/irqbench/irqloop.c
@@ -26,11 +26,6 @@
#include <sys/mman.h>
#include <rtdm/rttesting.h>
-static const char *devname_fmt[] = {
- "/dev/rttest-irqbench%d",
- "/dev/rttest%d",
-};
-
static int benchdev;
static int terminate;
@@ -86,7 +81,6 @@ int main(int argc, char *argv[])
int irq_set = 0;
int c;
int timeout = 10;
- int fmt = 0;
while ((c = getopt(argc, argv, "D:t:P:o:a:i:")) != EOF)
switch (c) {
@@ -142,12 +136,9 @@ int main(int argc, char *argv[])
mlockall(MCL_CURRENT|MCL_FUTURE);
-retry:
- snprintf(devname, RTDM_MAX_DEVNAME_LEN, devname_fmt[fmt], benchdev_no);
+ snprintf(devname, RTDM_MAX_DEVNAME_LEN, "/dev/rttest-irqbench%d",
benchdev_no);
benchdev = open(devname, O_RDWR);
if (benchdev < 0) {
- if (fmt++ == 0)
- goto retry;
perror("irqloop: failed to open benchmark device");
fprintf(stderr, "(modprobe xeno_irqbench?)\n");
return 1;
diff --git a/src/testsuite/latency/latency.c b/src/testsuite/latency/latency.c
index a5dd063..9f6fa7f 100644
--- a/src/testsuite/latency/latency.c
+++ b/src/testsuite/latency/latency.c
@@ -67,11 +67,6 @@ long *histogram_avg = NULL, *histogram_max = NULL,
*histogram_min = NULL;
int do_histogram = 0, do_stats = 0, finished = 0;
int bucketsize = 1000; /* default = 1000ns, -B <size> to override */
-static const char *devname_fmt[] = {
- "rttest-timerbench%d",
- "rttest%d",
-};
-
static inline void add_histogram(long *histogram, long addval)
{
/* bucketsize steps */
@@ -478,7 +473,6 @@ int main(int argc, char **argv)
int cpu = 0, c, err, sig;
char task_name[16];
sigset_t mask;
- int fmt = 0;
while ((c = getopt(argc, argv, "hp:l:T:qH:B:sD:t:fc:P:b")) != EOF)
switch (c) {
@@ -628,15 +622,11 @@ int main(int argc, char **argv)
if (test_mode != USER_TASK) {
char devname[RTDM_MAX_DEVNAME_LEN];
-retry:
- snprintf(devname, RTDM_MAX_DEVNAME_LEN, devname_fmt[fmt],
+ snprintf(devname, RTDM_MAX_DEVNAME_LEN, "rttest-timerbench%d",
benchdev_no);
benchdev = rt_dev_open(devname, O_RDWR);
if (benchdev < 0) {
- if (fmt++ == 0)
- goto retry;
-
fprintf(stderr,
"latency: failed to open benchmark device, code
%d\n"
"(modprobe xeno_timerbench?)\n", benchdev);
diff --git a/src/testsuite/switchtest/switchtest.c
b/src/testsuite/switchtest/switchtest.c
index 31b840d..4f61ee6 100644
--- a/src/testsuite/switchtest/switchtest.c
+++ b/src/testsuite/switchtest/switchtest.c
@@ -894,19 +894,13 @@ static int task_create(struct cpu_tasks *cpu,
#define DEV_NR_MAX 256
-static const char *devname_fmt[] = {
- "/dev/rttest-switchtest%d",
- "/dev/rttest%d",
-};
-
static int open_rttest(char *buf, size_t size, unsigned count)
{
static unsigned dev_nr = 0;
int fd, status;
- int fmt = 0;
do {
- snprintf(buf, size, devname_fmt[fmt], dev_nr);
+ snprintf(buf, size, "/dev/rttest-switchtest%d", dev_nr);
status = fd = open(buf, O_RDWR);
@@ -925,11 +919,6 @@ static int open_rttest(char *buf, size_t size, unsigned
count)
if (++dev_nr != DEV_NR_MAX)
continue;
- if (fmt++ == 0) {
- dev_nr = 0;
- continue;
- }
-
fprintf(stderr, "switchtest: Unable to open switchtest
device.\n"
"(modprobe xeno_switchtest ?)\n");
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
