blkid: add adaptec raid

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libs/blkid/src/blkidP.h b/libs/blkid/src/blkidP.h
index f81a43998422ea5ab193c6b49ba979cd1ed48689..acd10d4e63207a955f917d0065a5031312a25230 100644 (file)
--- a/libs/blkid/src/blkidP.h
+++ b/libs/blkid/src/blkidP.h
@@ -16,6 +16,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 
+#include "bitops.h"    /* $(top_srcdir)/include/ */
+
 #include "blkid.h"
 #include "list.h"
 

diff --git a/libs/blkid/src/probe.c b/libs/blkid/src/probe.c
index 42e8a725d9c1757419b28567f02f71b8b57eef94..247ce58497f35ee4930cd16478bdce752054bf62 100644 (file)
--- a/libs/blkid/src/probe.c
+++ b/libs/blkid/src/probe.c
@@ -37,8 +37,8 @@ static const struct blkid_idinfo *idinfos[] =
 {
        &swsuspend_idinfo,
        &cramfs_idinfo,
-       &swap_idinfo
-
+       &swap_idinfo,
+       &adraid_idinfo
 };
 
 #ifndef ARRAY_SIZE

diff --git a/libs/blkid/src/probers/Makefile.am b/libs/blkid/src/probers/Makefile.am
index 31bc2dafdec429a2a047e12b86488ec465793b5a..d966ef487469a08f1b7b5fea07dbf74182cee836 100644 (file)
--- a/libs/blkid/src/probers/Makefile.am
+++ b/libs/blkid/src/probers/Makefile.am
@@ -3,7 +3,10 @@ include $(top_srcdir)/config/include-Makefile.am
 AM_CPPFLAGS += -I$(top_builddir)/libs/blkid/src
 
 lib_LIBRARIES = libprobers.a
-libprobers_a_SOURCES = probers.h cramfs.c swap.c
 libprobers_a_CFLAGS = -fPIC
+libprobers_a_SOURCES =         probers.h \
+                       cramfs.c \
+                       swap.c \
+                       adaptec_raid.c
 
 all-local: $(lib_LIBRARIES)

diff --git a/libs/blkid/src/probers/adaptec_raid.c b/libs/blkid/src/probers/adaptec_raid.c
new file mode 100644 (file)
index 0000000..2bce73e
--- /dev/null
+++ b/libs/blkid/src/probers/adaptec_raid.c
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ * Copyright (C) 2006 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ * This file 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This file 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <stdint.h>
+
+#include "blkidP.h"
+
+struct adaptec_meta {
+       uint32_t        b0idcode;
+       uint8_t         lunsave[8];
+       uint16_t        sdtype;
+       uint16_t        ssavecyl;
+       uint8_t         ssavehed;
+       uint8_t         ssavesec;
+       uint8_t         sb0flags;
+       uint8_t         jbodEnable;
+       uint8_t         lundsave;
+       uint8_t         svpdirty;
+       uint16_t        biosInfo;
+       uint16_t        svwbskip;
+       uint16_t        svwbcln;
+       uint16_t        svwbmax;
+       uint16_t        res3;
+       uint16_t        svwbmin;
+       uint16_t        res4;
+       uint16_t        svrcacth;
+       uint16_t        svwcacth;
+       uint16_t        svwbdly;
+       uint8_t         svsdtime;
+       uint8_t         res5;
+       uint16_t        firmval;
+       uint16_t        firmbln;
+       uint32_t        firmblk;
+       uint32_t        fstrsvrb;
+       uint16_t        svBlockStorageTid;
+       uint16_t        svtid;
+       uint8_t         svseccfl;
+       uint8_t         res6;
+       uint8_t         svhbanum;
+       uint8_t         resver;
+       uint32_t        drivemagic;
+       uint8_t         reserved[20];
+       uint8_t         testnum;
+       uint8_t         testflags;
+       uint16_t        maxErrorCount;
+       uint32_t        count;
+       uint32_t        startTime;
+       uint32_t        interval;
+       uint8_t         tstxt0;
+       uint8_t         tstxt1;
+       uint8_t         serNum[32];
+       uint8_t         res8[102];
+       uint32_t        fwTestMagic;
+       uint32_t        fwTestSeqNum;
+       uint8_t         fwTestRes[8];
+       uint8_t         smagic[4];
+       uint32_t        raidtbl;
+       uint16_t        raidline;
+       uint8_t         res9[0xF6];
+};
+
+#define AD_SIGNATURE   "DPTM"
+#define AD_MAGIC       0x37FC4D1E
+
+
+static int probe_adraid(blkid_probe pr, const struct blkid_idmag *mag)
+{
+       uint64_t meta_off;
+       struct adaptec_meta *ad;
+
+       if (pr->size < 0x10000)
+               return -1;
+
+       meta_off = ((pr->size / 0x200)-1) * 0x200;
+       ad = (struct adaptec_meta *) blkid_probe_get_buffer(pr, meta_off, 0x200);
+       if (!ad)
+               return -1;
+
+       if (memcmp(ad->smagic, AD_SIGNATURE, sizeof(AD_SIGNATURE)) != 0)
+               return -1;
+
+       if (ad->b0idcode != be32_to_cpu(AD_MAGIC))
+               return -1;
+
+       if (blkid_probe_sprintf_version(pr, "%u", ad->resver) != 0)
+               return -1;
+
+       return 0;
+}
+
+const struct blkid_idinfo adraid_idinfo = {
+       .name           = "adaptec_raid_member",
+       .usage          = BLKID_USAGE_RAID,
+       .probefunc      = probe_adraid
+};
+
+

diff --git a/libs/blkid/src/probers/probers.h b/libs/blkid/src/probers/probers.h
index 148800d20541c96f332df840c31059a2403b8650..7be9ae8ea4d9c2ffbd8e1e94dabb5c3b5dfc9c6b 100644 (file)
--- a/libs/blkid/src/probers/probers.h
+++ b/libs/blkid/src/probers/probers.h
@@ -18,5 +18,6 @@
 extern const struct blkid_idinfo cramfs_idinfo;
 extern const struct blkid_idinfo swap_idinfo;
 extern const struct blkid_idinfo swsuspend_idinfo;
+extern const struct blkid_idinfo adraid_idinfo;
 
 #endif /* _BLKID_PROBE_H */