summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2004-12-09 21:51:15 +0000
committerJean Delvare <jdelvare@suse.de>2004-12-09 21:51:15 +0000
commite412d56fe5f789ee804be65b7c75c4a894a9b433 (patch)
treed538c85cd878d7f1fe51e5e652e45f2b9a9a4aed
parent0381477280f87c617fa7f7c0454f7f798a16ac11 (diff)
downloaddmidecode-git-e412d56fe5f789ee804be65b7c75c4a894a9b433.tar.gz
Define and use a default memory device common to all programs, those value
depends on the host system.
-rw-r--r--biosdecode.c3
-rw-r--r--config.h10
-rw-r--r--dmidecode.c3
-rw-r--r--ownership.c3
-rw-r--r--vpddecode.c3
5 files changed, 18 insertions, 4 deletions
diff --git a/biosdecode.c b/biosdecode.c
index dc65424..73621ac 100644
--- a/biosdecode.c
+++ b/biosdecode.c
@@ -56,6 +56,7 @@
#include <stdlib.h>
#include "version.h"
+#include "config.h"
#include "types.h"
#include "util.h"
@@ -503,7 +504,7 @@ int main(int argc, const char *argv[])
{
u8 *buf;
off_t fp;
- const char *devmem="/dev/mem";
+ const char *devmem=DEFAULT_MEM_DEV;
int i;
if(sizeof(u8)!=1 || sizeof(u16)!=2 || sizeof(u32)!=4)
diff --git a/config.h b/config.h
new file mode 100644
index 0000000..86970c5
--- /dev/null
+++ b/config.h
@@ -0,0 +1,10 @@
+/*
+ * Configuration
+ */
+
+/* Default memory device file */
+#ifdef __BEOS__
+#define DEFAULT_MEM_DEV "/dev/misc/mem"
+#else
+#define DEFAULT_MEM_DEV "/dev/mem"
+#endif
diff --git a/dmidecode.c b/dmidecode.c
index afef924..250dc45 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -56,6 +56,7 @@
#endif /* __ia64__ */
#include "version.h"
+#include "config.h"
#include "types.h"
#include "util.h"
@@ -3810,7 +3811,7 @@ int main(int argc, const char *argv[])
{
int found=0;
off_t fp;
- const char *devmem="/dev/mem";
+ const char *devmem=DEFAULT_MEM_DEV;
#ifdef USE_EFI
FILE *efi_systab;
const char *filename;
diff --git a/ownership.c b/ownership.c
index d667b55..9aeab1c 100644
--- a/ownership.c
+++ b/ownership.c
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
+#include "config.h"
#include "types.h"
#include "util.h"
@@ -97,7 +98,7 @@ int main(int argc, const char *argv[])
{
u8 *buf;
off_t fp;
- const char *devmem="/dev/mem";
+ const char *devmem=DEFAULT_MEM_DEV;
int ok=0;
if(sizeof(u8)!=1 || sizeof(u32)!=4)
diff --git a/vpddecode.c b/vpddecode.c
index 8c18f93..abec617 100644
--- a/vpddecode.c
+++ b/vpddecode.c
@@ -38,6 +38,7 @@
#include <string.h>
#include "version.h"
+#include "config.h"
#include "types.h"
#include "util.h"
@@ -219,7 +220,7 @@ int main(int argc, const char *argv[])
u8 *buf;
int found=0;
off_t fp;
- const char *devmem="/dev/mem";
+ const char *devmem=DEFAULT_MEM_DEV;
if(sizeof(u8)!=1)
{