Import Upstream version 0.4.2.1

57 files changed, 268 insertions, 829 deletions

diff --git a/arch/linux/x86/.svn/README.txt b/arch/linux/x86/.svn/README.txt
deleted file mode 100644
index 271a8ce9..00000000
--- a/arch/linux/x86/.svn/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a Subversion working copy administrative directory.
-Visit http://subversion.tigris.org/ for more information.
diff --git a/arch/linux/x86/.svn/empty-file b/arch/linux/x86/.svn/empty-file
deleted file mode 100644
index e69de29b..00000000
--- a/arch/linux/x86/.svn/empty-file
+++ /dev/null
diff --git a/arch/linux/x86/.svn/entries b/arch/linux/x86/.svn/entries
deleted file mode 100644
index 098b3a34..00000000
--- a/arch/linux/x86/.svn/entries
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wc-entries
-   xmlns="svn:">
-<entry
-   committed-rev="4"
-   name=""
-   committed-date="2006-01-31T23:35:06.244169Z"
-   url="svn+ssh://lafp@svn.berlios.de/svnroot/repos/hardinfo/trunk/hardinfo2/arch/linux/x86"
-   last-author="lafp"
-   kind="dir"
-   uuid="03931a0e-0c0b-0410-87e6-c9e79dddb921"
-   repos="svn+ssh://lafp@svn.berlios.de/svnroot/repos/hardinfo"
-   revision="9"/>
-<entry
-   committed-rev="1"
-   name="usb.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="0ed17ec7082ecf81bc512f4d2add7bec"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="sensors.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="ba83966be8f142e8f9fbed44bfc77b7a"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="inputdevices.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="1307b7aff245fa7fba84aa91f08d27fc"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="uptime.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="760f1adef4fbcec7d74200abc3a4f6eb"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="storage.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="602ef4aa9053cd983170660f53334cef"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="memory.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="765f1eed8d98b9bbb06c4c034ce9fa32"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="modules.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="45dfbaaabb31981ac06e021773429228"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="pci.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="cab1a2936974aed489c107f3643b3484"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="loadavg.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="1c83a008e883018ff1092781358ec2da"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="18"
-   name="processor.h"
-   text-time="2006-06-15T14:36:55.000000Z"
-   committed-date="2006-06-16T14:09:52.687901Z"
-   checksum="d9e2705aa2ed9d80913de5d5b4a025b0"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"
-   revision="18"/>
-<entry
-   committed-rev="1"
-   name="alsa.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="dc249687377b2de88793ee09bf54f1f1"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="os.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="048c3f4b338d765be4f10b5067d8b50e"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="samba.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="b541109072721d735717a33724ce9127"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="1"
-   name="filesystem.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-23T22:38:33.949992Z"
-   checksum="7f23b37be4cf5009414843bfe5c4e450"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="3"
-   name="net.h"
-   text-time="2006-05-20T14:29:23.000000Z"
-   committed-date="2006-01-26T19:39:15.288417Z"
-   checksum="22e5b201692010dee02e9562ce6cba1b"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-20T14:29:23.000000Z"/>
-<entry
-   committed-rev="13"
-   name="nfs.h"
-   text-time="2006-05-22T12:06:58.000000Z"
-   committed-date="2006-05-22T12:11:05.185078Z"
-   checksum="382976a6eab28131079a346dd16edcd7"
-   last-author="lafp"
-   kind="file"
-   prop-time="2006-05-22T12:07:36.000000Z"
-   revision="13"/>
-</wc-entries>
diff --git a/arch/linux/x86/.svn/format b/arch/linux/x86/.svn/format
deleted file mode 100644
index b8626c4c..00000000
--- a/arch/linux/x86/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/arch/linux/x86/.svn/prop-base/alsa.h.svn-base b/arch/linux/x86/.svn/prop-base/alsa.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/alsa.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/filesystem.h.svn-base b/arch/linux/x86/.svn/prop-base/filesystem.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/filesystem.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/inputdevices.h.svn-base b/arch/linux/x86/.svn/prop-base/inputdevices.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/inputdevices.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/loadavg.h.svn-base b/arch/linux/x86/.svn/prop-base/loadavg.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/loadavg.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/memory.h.svn-base b/arch/linux/x86/.svn/prop-base/memory.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/memory.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/modules.h.svn-base b/arch/linux/x86/.svn/prop-base/modules.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/modules.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/net.h.svn-base b/arch/linux/x86/.svn/prop-base/net.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/net.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/nfs.h.svn-base b/arch/linux/x86/.svn/prop-base/nfs.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/nfs.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/os.h.svn-base b/arch/linux/x86/.svn/prop-base/os.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/os.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/pci.h.svn-base b/arch/linux/x86/.svn/prop-base/pci.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/pci.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/processor.h.svn-base b/arch/linux/x86/.svn/prop-base/processor.h.svn-base
deleted file mode 100644
index e69de29b..00000000
--- a/arch/linux/x86/.svn/prop-base/processor.h.svn-base
+++ /dev/null
diff --git a/arch/linux/x86/.svn/prop-base/samba.h.svn-base b/arch/linux/x86/.svn/prop-base/samba.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/samba.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/sensors.h.svn-base b/arch/linux/x86/.svn/prop-base/sensors.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/sensors.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/storage.h.svn-base b/arch/linux/x86/.svn/prop-base/storage.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/storage.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/uptime.h.svn-base b/arch/linux/x86/.svn/prop-base/uptime.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/uptime.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/prop-base/usb.h.svn-base b/arch/linux/x86/.svn/prop-base/usb.h.svn-base
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/prop-base/usb.h.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/alsa.h.svn-work b/arch/linux/x86/.svn/props/alsa.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/alsa.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/filesystem.h.svn-work b/arch/linux/x86/.svn/props/filesystem.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/filesystem.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/inputdevices.h.svn-work b/arch/linux/x86/.svn/props/inputdevices.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/inputdevices.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/loadavg.h.svn-work b/arch/linux/x86/.svn/props/loadavg.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/loadavg.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/memory.h.svn-work b/arch/linux/x86/.svn/props/memory.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/memory.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/modules.h.svn-work b/arch/linux/x86/.svn/props/modules.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/modules.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/net.h.svn-work b/arch/linux/x86/.svn/props/net.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/net.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/nfs.h.svn-work b/arch/linux/x86/.svn/props/nfs.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/nfs.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/os.h.svn-work b/arch/linux/x86/.svn/props/os.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/os.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/pci.h.svn-work b/arch/linux/x86/.svn/props/pci.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/pci.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/processor.h.svn-work b/arch/linux/x86/.svn/props/processor.h.svn-work
deleted file mode 100644
index e69de29b..00000000
--- a/arch/linux/x86/.svn/props/processor.h.svn-work
+++ /dev/null
diff --git a/arch/linux/x86/.svn/props/samba.h.svn-work b/arch/linux/x86/.svn/props/samba.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/samba.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/sensors.h.svn-work b/arch/linux/x86/.svn/props/sensors.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/sensors.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/storage.h.svn-work b/arch/linux/x86/.svn/props/storage.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/storage.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/uptime.h.svn-work b/arch/linux/x86/.svn/props/uptime.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/uptime.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/props/usb.h.svn-work b/arch/linux/x86/.svn/props/usb.h.svn-work
deleted file mode 100644
index d2224698..00000000
--- a/arch/linux/x86/.svn/props/usb.h.svn-work
+++ /dev/null
@@ -1,5 +0,0 @@
-K 11
-svn:special
-V 1
-*
-END
diff --git a/arch/linux/x86/.svn/text-base/alsa.h.svn-base b/arch/linux/x86/.svn/text-base/alsa.h.svn-base
deleted file mode 100644
index e17b92c3..00000000
--- a/arch/linux/x86/.svn/text-base/alsa.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/alsa.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/filesystem.h.svn-base b/arch/linux/x86/.svn/text-base/filesystem.h.svn-base
deleted file mode 100644
index 0d23c803..00000000
--- a/arch/linux/x86/.svn/text-base/filesystem.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/filesystem.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/inputdevices.h.svn-base b/arch/linux/x86/.svn/text-base/inputdevices.h.svn-base
deleted file mode 100644
index 58695156..00000000
--- a/arch/linux/x86/.svn/text-base/inputdevices.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/inputdevices.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/loadavg.h.svn-base b/arch/linux/x86/.svn/text-base/loadavg.h.svn-base
deleted file mode 100644
index 354f872f..00000000
--- a/arch/linux/x86/.svn/text-base/loadavg.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/loadavg.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/memory.h.svn-base b/arch/linux/x86/.svn/text-base/memory.h.svn-base
deleted file mode 100644
index 2b2ad528..00000000
--- a/arch/linux/x86/.svn/text-base/memory.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/memory.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/modules.h.svn-base b/arch/linux/x86/.svn/text-base/modules.h.svn-base
deleted file mode 100644
index d80f7d7a..00000000
--- a/arch/linux/x86/.svn/text-base/modules.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/modules.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/net.h.svn-base b/arch/linux/x86/.svn/text-base/net.h.svn-base
deleted file mode 100644
index 2b4ac97a..00000000
--- a/arch/linux/x86/.svn/text-base/net.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/net.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/nfs.h.svn-base b/arch/linux/x86/.svn/text-base/nfs.h.svn-base
deleted file mode 100644
index c10bd829..00000000
--- a/arch/linux/x86/.svn/text-base/nfs.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/nfs.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/os.h.svn-base b/arch/linux/x86/.svn/text-base/os.h.svn-base
deleted file mode 100644
index 49613b1f..00000000
--- a/arch/linux/x86/.svn/text-base/os.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/os.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/pci.h.svn-base b/arch/linux/x86/.svn/text-base/pci.h.svn-base
deleted file mode 100644
index 2386d2ad..00000000
--- a/arch/linux/x86/.svn/text-base/pci.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/pci.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/processor.h.svn-base b/arch/linux/x86/.svn/text-base/processor.h.svn-base
deleted file mode 100644
index aba623bf..00000000
--- a/arch/linux/x86/.svn/text-base/processor.h.svn-base
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- *    HardInfo - Displays System Information
- *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
- *
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-/*
- * This function is partly based on x86cpucaps
- * by Osamu Kayasono <jacobi@jcom.home.ne.jp>
- */   
-static void
-get_processor_strfamily(Processor *processor)
-{
-    gint family = processor->family;
-    gint model = processor->model;
-
-    if (g_str_equal(processor->vendor_id, "GenuineIntel")) {
-        if (family == 4) {
-            processor->strmodel = g_strdup("i486 series");
-        } else if (family == 5) {
-            if (model < 4) {
-                processor->strmodel = g_strdup("Pentium Classic");
-            } else {
-                processor->strmodel = g_strdup("Pentium MMX");
-            }
-        } else if (family == 6) {
-            if (model <= 1) {
-                processor->strmodel = g_strdup("Pentium Pro");
-            } else if (model < 7) {
-                processor->strmodel = g_strdup("Pentium II/Pentium II Xeon/Celeron");
-            } else if (model == 9) {
-                processor->strmodel = g_strdup("Pentium M");
-            } else {
-                processor->strmodel = g_strdup("Pentium III/Pentium III Xeon/Celeron");
-            }
-        } else if (family > 6) {
-            processor->strmodel = g_strdup("Pentium 4");
-        } else {
-            processor->strmodel = g_strdup("i386 class");
-        }
-    } else if (g_str_equal(processor->vendor_id, "AuthenticAMD")) {
-        if (family == 4) {
-            if (model <= 9) {
-                processor->strmodel = g_strdup("AMD i80486 series");
-            } else {
-                processor->strmodel = g_strdup("AMD 5x86");
-            }
-        } else if (family == 5) {
-            if (model <= 3) {
-                processor->strmodel = g_strdup("AMD K5");
-            } else if (model <= 7) {
-                processor->strmodel = g_strdup("AMD K6");
-            } else if (model == 8) {
-                processor->strmodel = g_strdup("AMD K6-2");
-            } else if (model == 9) {
-                processor->strmodel = g_strdup("AMD K6-III");
-            } else {
-                processor->strmodel = g_strdup("AMD K6-2+/III+");
-            }
-        } else if (family == 6) {
-            if (model == 1) {
-                processor->strmodel = g_strdup("AMD Athlon (K7");
-            } else if (model == 2) {
-                processor->strmodel = g_strdup("AMD Athlon (K75)");
-            } else if (model == 3) {
-                processor->strmodel = g_strdup("AMD Duron (Spitfire)");
-            } else if (model == 4) {
-                processor->strmodel = g_strdup("AMD Athlon (Thunderbird)");
-            } else if (model == 6) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP/4 (Palomino)");
-            } else if (model == 7) {
-                processor->strmodel = g_strdup("AMD Duron (Morgan)");
-            } else if (model == 8) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP (Thoroughbred)");
-            } else if (model == 10) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP (Barton)");
-            } else {
-                processor->strmodel = g_strdup("AMD Athlon (unknown)");
-            }
-        } else if (family > 6) {
-            processor->strmodel = g_strdup("AMD Opteron/Athlon64/FX");
-        } else {
-            processor->strmodel = g_strdup("AMD i386 class");
-        }
-    } else if (g_str_equal(processor->vendor_id, "CyrixInstead")) {
-        if (family == 4) {
-            processor->strmodel = g_strdup("Cyrix 5x86");
-        } else if (family == 5) {
-            processor->strmodel = g_strdup("Cyrix M1 (6x86)");
-        } else if (family == 6) {
-            if (model == 0) {
-                processor->strmodel = g_strdup("Cyrix M2 (6x86MX)");
-            } else if (model <= 5) {
-                processor->strmodel = g_strdup("VIA Cyrix III (M2 core)");
-            } else if (model == 6) {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5A)");
-            } else if (model == 7) {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5B/C)");
-            } else {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5C-T)");
-            }
-        } else {
-            processor->strmodel = g_strdup("Cyrix i386 class");
-        }
-    } else if (g_str_equal(processor->vendor_id, "CentaurHauls")) {
-        if (family == 5) {
-            if (model <= 4) {
-                processor->strmodel = g_strdup("Centaur WinChip C6");
-            } else if (model <= 8) {
-                processor->strmodel = g_strdup("Centaur WinChip 2");
-            } else {
-                processor->strmodel = g_strdup("Centaur WinChip 2A");
-            }
-        } else {
-            processor->strmodel = g_strdup("Centaur i386 class");
-        }
-    } else if (g_str_equal(processor->vendor_id, "GenuineTMx86")) {
-        processor->strmodel = g_strdup("Transmeta Crusoe TM3x00/5x00");
-    } else {
-        processor->strmodel = g_strdup("Unknown");
-    }
-}
-
-static Processor *
-computer_get_processor(void)
-{
-    Processor *processor;
-    FILE *cpuinfo;
-    gchar buffer[128];
-
-    cpuinfo = fopen("/proc/cpuinfo", "r");
-    if (!cpuinfo)
-	return NULL;
-
-    processor = g_new0(Processor, 1);
-    while (fgets(buffer, 128, cpuinfo)) {
-	gchar **tmp = g_strsplit(buffer, ":", 2);
-
-	if (tmp[0] && tmp[1]) {
-	    tmp[0] = g_strstrip(tmp[0]);
-	    tmp[1] = g_strstrip(tmp[1]);
-
-	    get_str("model name", processor->model_name);
-	    get_str("vendor_id", processor->vendor_id);
-	    get_str("flags", processor->flags);
-	    get_int("cache size", processor->cache_size);
-	    get_float("cpu MHz", processor->cpu_mhz);
-	    get_float("bogomips", processor->bogomips);
-
-	    get_str("fpu", processor->has_fpu);
-
-	    get_str("fdiv_bug", processor->bug_fdiv);
-	    get_str("hlt_bug", processor->bug_hlt);
-	    get_str("f00f_bug", processor->bug_f00f);
-	    get_str("coma_bug", processor->bug_coma);
-	    
-	    get_int("model", processor->model);
-	    get_int("cpu family", processor->family);
-	    get_int("stepping", processor->stepping);
-	}
-	g_strfreev(tmp);
-    }
-
-    get_processor_strfamily(processor);
-
-    fclose(cpuinfo);
-
-    return processor;
-}
-
-static struct {
-    char *name, *meaning;
-} flag_meaning[] = {
-    { "3dnow",		"3DNow! Technology" },
-    { "3dnowext",	"Extended 3DNow! Technology" },
-    { "fpu",		"Floating Point Unit" },
-    { "vme",		"Virtual 86 Mode Extension" },
-    { "de",		"Debug Extensions - I/O breakpoints" },
-    { "pse",		"Page Size Extensions (4MB pages)" },
-    { "tsc",		"Time Stamp Counter and RDTSC instruction" },
-    { "msr",		"Model Specific Registers" },
-    { "pae",		"Physical Address Extensions (36-bit address, 2MB pages)" },
-    { "mce",		"Machine Check Architeture" },
-    { "cx8",		"CMPXCHG8 instruction" },
-    { "apic",		"Advanced Programmable Interrupt Controller" },
-    { "sep",		"Fast System Call (SYSENTER/SYSEXIT instructions)" },
-    { "mtrr",		"Memory Type Range Registers" },
-    { "pge",		"Page Global Enable" },
-    { "mca",		"Machine Check Architecture" },
-    { "cmov",		"Conditional Move instruction" },
-    { "pat",		"Page Attribute Table" },
-    { "pse36",		"36bit Page Size Extensions" },
-    { "psn",		"96 bit Processor Serial Number" },
-    { "mmx",		"MMX technology" },
-    { "mmxext",		"Extended MMX Technology" },
-    { "cflush",		"Cache Flush" },
-    { "dtes",		"Debug Trace Store" },
-    { "fxsr",		"FXSAVE and FXRSTOR instructions" },
-    { "kni",		"Streaming SIMD instructions" },
-    { "xmm",		"Streaming SIMD instructions" },
-    { "ht",		"HyperThreading" },
-    { "mp",		"Multiprocessing Capable" },
-    { "sse",		"SSE instructions" },
-    { "sse2",		"SSE2 (WNI) instructions" },
-    { "acc",		"Automatic Clock Control" },
-    { "ia64",		"IA64 Instructions" },
-    { "syscall",	"SYSCALL and SYSEXIT instructions" },
-    { "nx",		"No-execute Page Protection" },
-    { "xd",		"Execute Disable" },
-    { "clflush",	"Cache Line Flush instruction" },
-    { "acpi",		"Thermal Monitor and Software Controlled Clock Facilities" },
-    { "dts",		"Debug Store" },
-    { "ss",		"Self Snoop" },
-    { "tm",		"Thermal Monitor" },
-    { "pbe",		"Pending Break Enable" },
-    { "pb",		"Pending Break Enable" },
-    { NULL, NULL}
-};
-
-gchar *
-processor_get_capabilities_from_flags(gchar * strflags)
-{
-    /* FIXME: * Separate between processor capabilities, additional instructions and whatnot.  */
-    gchar **flags, **old;
-    gchar *tmp = "";
-    gint i, j = 0;
-
-    flags = g_strsplit(strflags, " ", 0);
-    old = flags;
-
-    while (flags[j]) {
-	gchar *meaning = "";
-	for (i = 0; flag_meaning[i].name != NULL; i++) {
-	    if (!strcmp(flags[j], flag_meaning[i].name)) {
-		meaning = flag_meaning[i].meaning;
-		break;
-	    }
-	}
-
-	tmp = g_strdup_printf("%s%s=%s\n", tmp, flags[j], meaning);
-	j++;
-    }
-
-    g_strfreev(old);
-    return tmp;
-}
-
-static gchar *
-processor_get_info(Processor *processor)
-{
-	gchar *tmp = processor_get_capabilities_from_flags(processor->
-						  flags);
-	gchar *ret = g_strdup_printf("[Processor]\n"
-	                       "Name=%s\n"
-	                       "Specification=%s\n"
-                               "Family, model, stepping=%d, %d, %d\n"
-			       "Vendor=%s\n"
-			       "Cache Size=%dkb\n"
-			       "Frequency=%.2fMHz\n"
-			       "BogoMips=%.2f\n"
-			       "Byte Order=%s\n"
-			       "[Features]\n"
-			       "FDIV Bug=%s\n"
-			       "HLT Bug=%s\n"
-			       "F00F Bug=%s\n"
-			       "Coma Bug=%s\n"
-			       "Has FPU=%s\n"
-			       "[Capabilities]\n" "%s",
-			       processor->strmodel,
-			       processor->model_name,
-			       processor->family,
-			       processor->model,
-			       processor->stepping,
-			       processor->vendor_id,
-			       processor->cache_size,
-			       processor->cpu_mhz,
-			       processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian",
-#else
-                               "Big Endian",
-#endif
-			       processor->bug_fdiv,
-			       processor->bug_hlt,
-			       processor->bug_f00f,
-			       processor->bug_coma,
-			       processor->has_fpu,
-			       tmp);
-      g_free(tmp);
-      return ret;
-}
diff --git a/arch/linux/x86/.svn/text-base/samba.h.svn-base b/arch/linux/x86/.svn/text-base/samba.h.svn-base
deleted file mode 100644
index 246e9ed0..00000000
--- a/arch/linux/x86/.svn/text-base/samba.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/samba.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/sensors.h.svn-base b/arch/linux/x86/.svn/text-base/sensors.h.svn-base
deleted file mode 100644
index 822de7b7..00000000
--- a/arch/linux/x86/.svn/text-base/sensors.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/sensors.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/storage.h.svn-base b/arch/linux/x86/.svn/text-base/storage.h.svn-base
deleted file mode 100644
index 24568f89..00000000
--- a/arch/linux/x86/.svn/text-base/storage.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/storage.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/uptime.h.svn-base b/arch/linux/x86/.svn/text-base/uptime.h.svn-base
deleted file mode 100644
index 25cc41e9..00000000
--- a/arch/linux/x86/.svn/text-base/uptime.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/uptime.h
\ No newline at end of file
diff --git a/arch/linux/x86/.svn/text-base/usb.h.svn-base b/arch/linux/x86/.svn/text-base/usb.h.svn-base
deleted file mode 100644
index 8aece87f..00000000
--- a/arch/linux/x86/.svn/text-base/usb.h.svn-base
+++ /dev/null
@@ -1 +0,0 @@
-link ../../linux/common/usb.h
\ No newline at end of file
diff --git a/arch/linux/x86/battery.h b/arch/linux/x86/battery.h
new file mode 120000
index 00000000..e4c794f2
--- /dev/null
+++ b/arch/linux/x86/battery.h
@@ -0,0 +1 @@
+../../linux/common/battery.h
\ No newline at end of file
diff --git a/arch/linux/x86/boots.h b/arch/linux/x86/boots.h
new file mode 120000
index 00000000..97384500
--- /dev/null
+++ b/arch/linux/x86/boots.h
@@ -0,0 +1 @@
+../../../arch/linux/common/boots.h
\ No newline at end of file
diff --git a/arch/linux/x86/devmemory.h b/arch/linux/x86/devmemory.h
new file mode 120000
index 00000000..f8a833e7
--- /dev/null
+++ b/arch/linux/x86/devmemory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/devmemory.h
\ No newline at end of file
diff --git a/arch/linux/x86/net.h b/arch/linux/x86/net.h
index 72d77b26..488b5ae3 120000
--- a/arch/linux/x86/net.h
+++ b/arch/linux/x86/net.h
@@ -1 +1 @@
-../../linux/common/net.h
\ No newline at end of file
+../../../arch/linux/common/net.h
\ No newline at end of file
diff --git a/arch/linux/x86/processor.h b/arch/linux/x86/processor.h
index aba623bf..918bac7c 100644
--- a/arch/linux/x86/processor.h
+++ b/arch/linux/x86/processor.h
@@ -16,138 +16,161 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+struct _Processor {
+    gchar *model_name;
+    gchar *vendor_id;
+    gchar *flags;
+    gint cache_size;
+    gfloat bogomips, cpu_mhz;
+
+    gchar *has_fpu;
+    gchar *bug_fdiv, *bug_hlt, *bug_f00f, *bug_coma;
+    
+    gint model, family, stepping;
+    gchar *strmodel;
+    
+    gint id;
+};
+
 /*
  * This function is partly based on x86cpucaps
  * by Osamu Kayasono <jacobi@jcom.home.ne.jp>
- */   
-static void
-get_processor_strfamily(Processor *processor)
+ */
+static void get_processor_strfamily(Processor * processor)
 {
     gint family = processor->family;
     gint model = processor->model;
 
     if (g_str_equal(processor->vendor_id, "GenuineIntel")) {
-        if (family == 4) {
-            processor->strmodel = g_strdup("i486 series");
-        } else if (family == 5) {
-            if (model < 4) {
-                processor->strmodel = g_strdup("Pentium Classic");
-            } else {
-                processor->strmodel = g_strdup("Pentium MMX");
-            }
-        } else if (family == 6) {
-            if (model <= 1) {
-                processor->strmodel = g_strdup("Pentium Pro");
-            } else if (model < 7) {
-                processor->strmodel = g_strdup("Pentium II/Pentium II Xeon/Celeron");
-            } else if (model == 9) {
-                processor->strmodel = g_strdup("Pentium M");
-            } else {
-                processor->strmodel = g_strdup("Pentium III/Pentium III Xeon/Celeron");
-            }
-        } else if (family > 6) {
-            processor->strmodel = g_strdup("Pentium 4");
-        } else {
-            processor->strmodel = g_strdup("i386 class");
-        }
+	if (family == 4) {
+	    processor->strmodel = g_strdup("i486 series");
+	} else if (family == 5) {
+	    if (model < 4) {
+		processor->strmodel = g_strdup("Pentium Classic");
+	    } else {
+		processor->strmodel = g_strdup("Pentium MMX");
+	    }
+	} else if (family == 6) {
+	    if (model <= 1) {
+		processor->strmodel = g_strdup("Pentium Pro");
+	    } else if (model < 7) {
+		processor->strmodel = g_strdup("Pentium II/Pentium II Xeon/Celeron");
+	    } else if (model == 9) {
+		processor->strmodel = g_strdup("Pentium M");
+	    } else {
+		processor->strmodel = g_strdup("Pentium III/Pentium III Xeon/Celeron");
+	    }
+	} else if (family > 6) {
+	    processor->strmodel = g_strdup("Pentium 4");
+	} else {
+	    processor->strmodel = g_strdup("i386 class");
+	}
     } else if (g_str_equal(processor->vendor_id, "AuthenticAMD")) {
-        if (family == 4) {
-            if (model <= 9) {
-                processor->strmodel = g_strdup("AMD i80486 series");
-            } else {
-                processor->strmodel = g_strdup("AMD 5x86");
-            }
-        } else if (family == 5) {
-            if (model <= 3) {
-                processor->strmodel = g_strdup("AMD K5");
-            } else if (model <= 7) {
-                processor->strmodel = g_strdup("AMD K6");
-            } else if (model == 8) {
-                processor->strmodel = g_strdup("AMD K6-2");
-            } else if (model == 9) {
-                processor->strmodel = g_strdup("AMD K6-III");
-            } else {
-                processor->strmodel = g_strdup("AMD K6-2+/III+");
-            }
-        } else if (family == 6) {
-            if (model == 1) {
-                processor->strmodel = g_strdup("AMD Athlon (K7");
-            } else if (model == 2) {
-                processor->strmodel = g_strdup("AMD Athlon (K75)");
-            } else if (model == 3) {
-                processor->strmodel = g_strdup("AMD Duron (Spitfire)");
-            } else if (model == 4) {
-                processor->strmodel = g_strdup("AMD Athlon (Thunderbird)");
-            } else if (model == 6) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP/4 (Palomino)");
-            } else if (model == 7) {
-                processor->strmodel = g_strdup("AMD Duron (Morgan)");
-            } else if (model == 8) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP (Thoroughbred)");
-            } else if (model == 10) {
-                processor->strmodel = g_strdup("AMD Athlon XP/MP (Barton)");
-            } else {
-                processor->strmodel = g_strdup("AMD Athlon (unknown)");
-            }
-        } else if (family > 6) {
-            processor->strmodel = g_strdup("AMD Opteron/Athlon64/FX");
-        } else {
-            processor->strmodel = g_strdup("AMD i386 class");
-        }
+	if (family == 4) {
+	    if (model <= 9) {
+		processor->strmodel = g_strdup("AMD i80486 series");
+	    } else {
+		processor->strmodel = g_strdup("AMD 5x86");
+	    }
+	} else if (family == 5) {
+	    if (model <= 3) {
+		processor->strmodel = g_strdup("AMD K5");
+	    } else if (model <= 7) {
+		processor->strmodel = g_strdup("AMD K6");
+	    } else if (model == 8) {
+		processor->strmodel = g_strdup("AMD K6-2");
+	    } else if (model == 9) {
+		processor->strmodel = g_strdup("AMD K6-III");
+	    } else {
+		processor->strmodel = g_strdup("AMD K6-2+/III+");
+	    }
+	} else if (family == 6) {
+	    if (model == 1) {
+		processor->strmodel = g_strdup("AMD Athlon (K7)");
+	    } else if (model == 2) {
+		processor->strmodel = g_strdup("AMD Athlon (K75)");
+	    } else if (model == 3) {
+		processor->strmodel = g_strdup("AMD Duron (Spitfire)");
+	    } else if (model == 4) {
+		processor->strmodel = g_strdup("AMD Athlon (Thunderbird)");
+	    } else if (model == 6) {
+		processor->strmodel = g_strdup("AMD Athlon XP/MP/4 (Palomino)");
+	    } else if (model == 7) {
+		processor->strmodel = g_strdup("AMD Duron (Morgan)");
+	    } else if (model == 8) {
+		processor->strmodel = g_strdup("AMD Athlon XP/MP (Thoroughbred)");
+	    } else if (model == 10) {
+		processor->strmodel = g_strdup("AMD Athlon XP/MP (Barton)");
+	    } else {
+		processor->strmodel = g_strdup("AMD Athlon (unknown)");
+	    }
+	} else if (family > 6) {
+	    processor->strmodel = g_strdup("AMD Opteron/Athlon64/FX");
+	} else {
+	    processor->strmodel = g_strdup("AMD i386 class");
+	}
     } else if (g_str_equal(processor->vendor_id, "CyrixInstead")) {
-        if (family == 4) {
-            processor->strmodel = g_strdup("Cyrix 5x86");
-        } else if (family == 5) {
-            processor->strmodel = g_strdup("Cyrix M1 (6x86)");
-        } else if (family == 6) {
-            if (model == 0) {
-                processor->strmodel = g_strdup("Cyrix M2 (6x86MX)");
-            } else if (model <= 5) {
-                processor->strmodel = g_strdup("VIA Cyrix III (M2 core)");
-            } else if (model == 6) {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5A)");
-            } else if (model == 7) {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5B/C)");
-            } else {
-                processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5C-T)");
-            }
-        } else {
-            processor->strmodel = g_strdup("Cyrix i386 class");
-        }
+	if (family == 4) {
+	    processor->strmodel = g_strdup("Cyrix 5x86");
+	} else if (family == 5) {
+	    processor->strmodel = g_strdup("Cyrix M1 (6x86)");
+	} else if (family == 6) {
+	    if (model == 0) {
+		processor->strmodel = g_strdup("Cyrix M2 (6x86MX)");
+	    } else if (model <= 5) {
+		processor->strmodel = g_strdup("VIA Cyrix III (M2 core)");
+	    } else if (model == 6) {
+		processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5A)");
+	    } else if (model == 7) {
+		processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5B/C)");
+	    } else {
+		processor->strmodel = g_strdup("VIA Cyrix III (WinChip C5C-T)");
+	    }
+	} else {
+	    processor->strmodel = g_strdup("Cyrix i386 class");
+	}
     } else if (g_str_equal(processor->vendor_id, "CentaurHauls")) {
-        if (family == 5) {
-            if (model <= 4) {
-                processor->strmodel = g_strdup("Centaur WinChip C6");
-            } else if (model <= 8) {
-                processor->strmodel = g_strdup("Centaur WinChip 2");
-            } else {
-                processor->strmodel = g_strdup("Centaur WinChip 2A");
-            }
-        } else {
-            processor->strmodel = g_strdup("Centaur i386 class");
-        }
+	if (family == 5) {
+	    if (model <= 4) {
+		processor->strmodel = g_strdup("Centaur WinChip C6");
+	    } else if (model <= 8) {
+		processor->strmodel = g_strdup("Centaur WinChip 2");
+	    } else {
+		processor->strmodel = g_strdup("Centaur WinChip 2A");
+	    }
+	} else {
+	    processor->strmodel = g_strdup("Centaur i386 class");
+	}
     } else if (g_str_equal(processor->vendor_id, "GenuineTMx86")) {
-        processor->strmodel = g_strdup("Transmeta Crusoe TM3x00/5x00");
+	processor->strmodel = g_strdup("Transmeta Crusoe TM3x00/5x00");
     } else {
-        processor->strmodel = g_strdup("Unknown");
+	processor->strmodel = g_strdup("Unknown");
     }
 }
 
-static Processor *
-computer_get_processor(void)
+static GSList *__scan_processors(void)
 {
-    Processor *processor;
+    GSList *procs = NULL;
+    Processor *processor = NULL;
     FILE *cpuinfo;
-    gchar buffer[128];
+    gchar buffer[256];
 
     cpuinfo = fopen("/proc/cpuinfo", "r");
     if (!cpuinfo)
 	return NULL;
 
-    processor = g_new0(Processor, 1);
-    while (fgets(buffer, 128, cpuinfo)) {
+    while (fgets(buffer, 256, cpuinfo)) {
 	gchar **tmp = g_strsplit(buffer, ":", 2);
 
+	if (g_str_has_prefix(tmp[0], "processor")) {
+	    if (processor) {
+		get_processor_strfamily(processor);
+		procs = g_slist_append(procs, processor);
+	    }
+
+	    processor = g_new0(Processor, 1);
+	}
+
 	if (tmp[0] && tmp[1]) {
 	    tmp[0] = g_strstrip(tmp[0]);
 	    tmp[1] = g_strstrip(tmp[1]);
@@ -165,74 +188,81 @@ computer_get_processor(void)
 	    get_str("hlt_bug", processor->bug_hlt);
 	    get_str("f00f_bug", processor->bug_f00f);
 	    get_str("coma_bug", processor->bug_coma);
-	    
+
 	    get_int("model", processor->model);
 	    get_int("cpu family", processor->family);
 	    get_int("stepping", processor->stepping);
+
+	    get_int("processor", processor->id);
 	}
 	g_strfreev(tmp);
     }
 
-    get_processor_strfamily(processor);
+    if (processor) {
+	get_processor_strfamily(processor);
+	procs = g_slist_append(procs, processor);
+    }
 
     fclose(cpuinfo);
 
-    return processor;
+    return procs;
 }
 
 static struct {
     char *name, *meaning;
 } flag_meaning[] = {
-    { "3dnow",		"3DNow! Technology" },
-    { "3dnowext",	"Extended 3DNow! Technology" },
-    { "fpu",		"Floating Point Unit" },
-    { "vme",		"Virtual 86 Mode Extension" },
-    { "de",		"Debug Extensions - I/O breakpoints" },
-    { "pse",		"Page Size Extensions (4MB pages)" },
-    { "tsc",		"Time Stamp Counter and RDTSC instruction" },
-    { "msr",		"Model Specific Registers" },
-    { "pae",		"Physical Address Extensions (36-bit address, 2MB pages)" },
-    { "mce",		"Machine Check Architeture" },
-    { "cx8",		"CMPXCHG8 instruction" },
-    { "apic",		"Advanced Programmable Interrupt Controller" },
-    { "sep",		"Fast System Call (SYSENTER/SYSEXIT instructions)" },
-    { "mtrr",		"Memory Type Range Registers" },
-    { "pge",		"Page Global Enable" },
-    { "mca",		"Machine Check Architecture" },
-    { "cmov",		"Conditional Move instruction" },
-    { "pat",		"Page Attribute Table" },
-    { "pse36",		"36bit Page Size Extensions" },
-    { "psn",		"96 bit Processor Serial Number" },
-    { "mmx",		"MMX technology" },
-    { "mmxext",		"Extended MMX Technology" },
-    { "cflush",		"Cache Flush" },
-    { "dtes",		"Debug Trace Store" },
-    { "fxsr",		"FXSAVE and FXRSTOR instructions" },
-    { "kni",		"Streaming SIMD instructions" },
-    { "xmm",		"Streaming SIMD instructions" },
-    { "ht",		"HyperThreading" },
-    { "mp",		"Multiprocessing Capable" },
-    { "sse",		"SSE instructions" },
-    { "sse2",		"SSE2 (WNI) instructions" },
-    { "acc",		"Automatic Clock Control" },
-    { "ia64",		"IA64 Instructions" },
-    { "syscall",	"SYSCALL and SYSEXIT instructions" },
-    { "nx",		"No-execute Page Protection" },
-    { "xd",		"Execute Disable" },
-    { "clflush",	"Cache Line Flush instruction" },
-    { "acpi",		"Thermal Monitor and Software Controlled Clock Facilities" },
-    { "dts",		"Debug Store" },
-    { "ss",		"Self Snoop" },
-    { "tm",		"Thermal Monitor" },
-    { "pbe",		"Pending Break Enable" },
-    { "pb",		"Pending Break Enable" },
-    { NULL, NULL}
+	{ "3dnow",	"3DNow! Technology"				},
+	{ "3dnowext",	"Extended 3DNow! Technology"			},
+	{ "fpu",	"Floating Point Unit"				},
+	{ "vme",	"Virtual 86 Mode Extension"			},
+	{ "de",		"Debug Extensions - I/O breakpoints"		},
+	{ "pse",	"Page Size Extensions (4MB pages)"		},
+	{ "tsc",	"Time Stamp Counter and RDTSC instruction"	},
+	{ "msr",	"Model Specific Registers"			},
+	{ "pae",	"Physical Address Extensions"			},
+	{ "mce",	"Machine Check Architeture"			},
+	{ "cx8",	"CMPXCHG8 instruction"				},
+	{ "apic",	"Advanced Programmable Interrupt Controller"	},
+	{ "sep",	"Fast System Call (SYSENTER/SYSEXIT)"		},
+	{ "mtrr",	"Memory Type Range Registers"			},
+	{ "pge",	"Page Global Enable"				},
+	{ "mca",	"Machine Check Architecture"			},
+	{ "cmov",	"Conditional Move instruction"			},
+	{ "pat",	"Page Attribute Table"				},
+	{ "pse36",	"36bit Page Size Extensions"			},
+	{ "psn",	"96 bit Processor Serial Number"		},
+	{ "mmx",	"MMX technology"				},
+	{ "mmxext",	"Extended MMX Technology"			},
+	{ "cflush",	"Cache Flush"					},
+	{ "dtes",	"Debug Trace Store"				},
+	{ "fxsr",	"FXSAVE and FXRSTOR instructions"		},
+	{ "kni",	"Streaming SIMD instructions"			},
+	{ "xmm",	"Streaming SIMD instructions"			},
+	{ "ht",		"HyperThreading"				},
+	{ "mp",		"Multiprocessing Capable"			},
+	{ "sse",	"SSE instructions"				},
+	{ "sse2",	"SSE2 (WNI) instructions"			},
+	{ "acc",	"Automatic Clock Control"			},
+	{ "ia64",	"IA64 Instructions"				},
+	{ "syscall",	"SYSCALL and SYSEXIT instructions"		},
+	{ "nx",		"No-execute Page Protection"			},
+	{ "xd",		"Execute Disable"				},
+	{ "clflush",	"Cache Line Flush instruction"			},
+	{ "acpi",	"Thermal Monitor and Software Controlled Clock"	},
+	{ "dts",	"Debug Store"					},
+	{ "ss",		"Self Snoop"					},
+	{ "tm",		"Thermal Monitor"				},
+	{ "pbe",	"Pending Break Enable"				},
+	{ "pb",		"Pending Break Enable"				},
+	{ NULL,		NULL						},
 };
 
-gchar *
-processor_get_capabilities_from_flags(gchar * strflags)
+gchar *processor_get_capabilities_from_flags(gchar * strflags)
 {
-    /* FIXME: * Separate between processor capabilities, additional instructions and whatnot.  */
+    /* FIXME:
+     * - Separate between processor capabilities, additional instructions and whatnot.  
+     * - Use binary search or something faster than this O(n) cruft
+     */
     gchar **flags, **old;
     gchar *tmp = "";
     gint i, j = 0;
@@ -243,7 +273,7 @@ processor_get_capabilities_from_flags(gchar * strflags)
     while (flags[j]) {
 	gchar *meaning = "";
 	for (i = 0; flag_meaning[i].name != NULL; i++) {
-	    if (!strcmp(flags[j], flag_meaning[i].name)) {
+	    if (g_str_equal(flags[j], flag_meaning[i].name)) {
 		meaning = flag_meaning[i].meaning;
 		break;
 	    }
@@ -257,47 +287,84 @@ processor_get_capabilities_from_flags(gchar * strflags)
     return tmp;
 }
 
-static gchar *
-processor_get_info(Processor *processor)
+static gchar *processor_get_detailed_info(Processor * processor)
 {
-	gchar *tmp = processor_get_capabilities_from_flags(processor->
-						  flags);
-	gchar *ret = g_strdup_printf("[Processor]\n"
-	                       "Name=%s\n"
-	                       "Specification=%s\n"
-                               "Family, model, stepping=%d, %d, %d\n"
-			       "Vendor=%s\n"
-			       "Cache Size=%dkb\n"
-			       "Frequency=%.2fMHz\n"
-			       "BogoMips=%.2f\n"
-			       "Byte Order=%s\n"
-			       "[Features]\n"
-			       "FDIV Bug=%s\n"
-			       "HLT Bug=%s\n"
-			       "F00F Bug=%s\n"
-			       "Coma Bug=%s\n"
-			       "Has FPU=%s\n"
-			       "[Capabilities]\n" "%s",
-			       processor->strmodel,
-			       processor->model_name,
-			       processor->family,
-			       processor->model,
-			       processor->stepping,
-			       processor->vendor_id,
-			       processor->cache_size,
-			       processor->cpu_mhz,
-			       processor->bogomips,
+    gchar *tmp, *ret;
+
+    tmp = processor_get_capabilities_from_flags(processor->flags);
+    ret = g_strdup_printf("[Processor]\n"
+			  "Name=%s\n"
+			  "Family, model, stepping=%d, %d, %d (%s)\n"
+			  "Vendor=%s\n"
+			  "[Configuration]\n"
+			  "Cache Size=%dkb\n"
+			  "Frequency=%.2fMHz\n"
+			  "BogoMIPS=%.2f\n"
+			  "Byte Order=%s\n"
+			  "[Features]\n"
+			  "FDIV Bug=%s\n"
+			  "HLT Bug=%s\n"
+			  "F00F Bug=%s\n"
+			  "Coma Bug=%s\n"
+			  "Has FPU=%s\n"
+			  "[Capabilities]\n"
+			  "%s",
+			  processor->model_name,
+			  processor->family,
+			  processor->model,
+			  processor->stepping,
+			  processor->strmodel,
+			  vendor_get_name(processor->vendor_id),
+			  processor->cache_size,
+			  processor->cpu_mhz, processor->bogomips,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                               "Little Endian",
+			  "Little Endian",
 #else
-                               "Big Endian",
+			  "Big Endian",
 #endif
-			       processor->bug_fdiv,
-			       processor->bug_hlt,
-			       processor->bug_f00f,
-			       processor->bug_coma,
-			       processor->has_fpu,
-			       tmp);
-      g_free(tmp);
-      return ret;
+			  processor->bug_fdiv ? processor->bug_fdiv : "yes",
+			  processor->bug_hlt  ? processor->bug_hlt  : "yes",
+			  processor->bug_f00f ? processor->bug_f00f : "yes",
+			  processor->bug_coma ? processor->bug_coma : "yes",
+			  processor->has_fpu  ? processor->has_fpu  : "no",
+			  tmp);
+    g_free(tmp);
+    return ret;
+
+}
+
+static gchar *processor_get_info(GSList * processors)
+{
+    Processor *processor;
+
+    if (g_slist_length(processors) > 1) {
+	gchar *ret, *tmp, *hashkey;
+	GSList *l;
+
+	tmp = g_strdup("");
+
+	for (l = processors; l; l = l->next) {
+	    processor = (Processor *) l->data;
+
+	    tmp = g_strdup_printf("%s$CPU%d$%s=%.2fMHz\n",
+				  tmp, processor->id,
+				  processor->model_name,
+				  processor->cpu_mhz);
+
+	    hashkey = g_strdup_printf("CPU%d", processor->id);
+	    g_hash_table_insert(moreinfo, hashkey,
+				processor_get_detailed_info(processor));
+	}
+
+	ret = g_strdup_printf("[$ShellParam$]\n"
+			      "ViewType=1\n"
+			      "[Processors]\n"
+			      "%s", tmp);
+	g_free(tmp);
+	
+	return ret;
+    }
+
+    processor = (Processor *) processors->data;
+    return processor_get_detailed_info(processor);
 }