]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
reimport sunpc
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 6 Feb 2010 20:36:24 +0000 (21:36 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 6 Feb 2010 20:36:24 +0000 (21:36 +0100)
conf/any-emu.rmk
conf/common.rmk
conf/i386-pc.rmk
partmap/sunpc.c [new file with mode: 0644]

index 9038aa45d0aab5e7667b1564bc9fad3e14694f70..33cb001a5a9b238acc49d6f81199d4bb5da56fb7 100644 (file)
@@ -34,7 +34,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        script/main.c script/execute.c script/function.c                \
        script/lexer.c script/script.c grub_script.tab.c                \
        partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c   \
-       partmap/acorn.c partmap/gpt.c partmap/bsdlabel.c                \
+       partmap/acorn.c partmap/gpt.c partmap/bsdlabel.c                \
+       partmap/sunpc.c         \
        \
        fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c                \
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
index 009db2907fbe7fdebac2f3e4e3ea46343cd3edd6..aefb5ac6f4e690963e028b3bd8d195fdc1ca2658 100644 (file)
@@ -33,7 +33,7 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c      \
        fs/befs.c fs/befs_be.c fs/tar.c         \
        \
        partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
-       partmap/sun.c partmap/gpt.c\
+       partmap/sun.c partmap/sunpc.c partmap/gpt.c \
        kern/fs.c kern/env.c fs/fshelp.c                        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
@@ -70,8 +70,8 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
        fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c      \
        fs/befs_be.c fs/tar.c                   \
        \
-       kern/partition.c partmap/msdos.c partmap/bsdlabel.c             \
-       partmap/apple.c partmap/sun.c partmap/gpt.c                     \
+       kern/partition.c partmap/msdos.c partmap/bsdlabel.c             \
+       partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c     \
        kern/fs.c kern/env.c fs/fshelp.c disk/raid.c                    \
        disk/raid5_recover.c disk/raid6_recover.c                       \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
@@ -383,6 +383,11 @@ part_bsd_mod_SOURCES = partmap/bsdlabel.c
 part_bsd_mod_CFLAGS = $(COMMON_CFLAGS)
 part_bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += part_sunpc.mod
+part_sunpc_mod_SOURCES = partmap/sunpc.c
+part_sunpc_mod_CFLAGS = $(COMMON_CFLAGS)
+part_sunpc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # Special disk structures and generic drivers
 
 pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
index 02675be91d7033600b04d1b8d287afb5f5570f90..4cdc819bd12839a2f01957826a82983840b01329 100644 (file)
@@ -104,7 +104,8 @@ grub_setup_SOURCES = gnulib/progname.c \
        fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c         \
        fs/befs.c fs/befs_be.c fs/tar.c                 \
        \
-       partmap/msdos.c partmap/bsdlabel.c partmap/gpt.c                \
+       partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c      \
+       partmap/gpt.c           \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
        util/raid.c util/lvm.c                                  \
diff --git a/partmap/sunpc.c b/partmap/sunpc.c
new file mode 100644 (file)
index 0000000..e3b16f0
--- /dev/null
@@ -0,0 +1,144 @@
+/* sunpc.c - Read SUN PC style partition tables.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2005,2006,2007,2009  Free Software Foundation, Inc.
+ *
+ *  GRUB 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 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/partition.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+#include <grub/symbol.h>
+#include <grub/types.h>
+#include <grub/err.h>
+
+#define GRUB_PARTMAP_SUN_PC_MAGIC 0xDABE
+#define GRUB_PARTMAP_SUN_PC_MAX_PARTS 16
+#define GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID 0x05
+
+struct grub_sun_pc_partition_descriptor
+{
+  grub_uint16_t id;
+  grub_uint16_t unused;
+  grub_uint32_t start_sector;
+  grub_uint32_t num_sectors;
+} __attribute__ ((packed));
+
+struct grub_sun_pc_block
+{
+  grub_uint8_t unused[72];
+  struct grub_sun_pc_partition_descriptor partitions[GRUB_PARTMAP_SUN_PC_MAX_PARTS];
+  grub_uint8_t unused2[244];
+  grub_uint16_t  magic;         /* Magic number.  */
+  grub_uint16_t  csum;          /* Label xor'd checksum.  */
+} __attribute__ ((packed));
+
+static struct grub_partition_map grub_sun_pc_partition_map;
+
+/* Verify checksum (true=ok).  */
+static int
+grub_sun_is_valid (struct grub_sun_pc_block *label)
+{
+  grub_uint16_t *pos;
+  grub_uint16_t sum = 0;
+
+  for (pos = (grub_uint16_t *) label;
+       pos < (grub_uint16_t *) (label + 1);
+       pos++)
+    sum ^= *pos;
+
+  return ! sum;
+}
+
+static grub_err_t
+sun_pc_partition_map_iterate (grub_disk_t disk,
+                             int (*hook) (grub_disk_t disk,
+                                          const grub_partition_t partition))
+{
+  grub_partition_t p;
+  struct grub_sun_pc_block block;
+  int partnum;
+  grub_err_t err;
+
+  p = (grub_partition_t) grub_zalloc (sizeof (struct grub_partition));
+  if (! p)
+    return grub_errno;
+
+  p->partmap = &grub_sun_pc_partition_map;
+  err = grub_disk_read (disk, 1, 0, sizeof (struct grub_sun_pc_block), &block);
+  if (err)
+    {
+      grub_free (p);
+      return err;
+    }
+  
+  if (GRUB_PARTMAP_SUN_PC_MAGIC != grub_le_to_cpu16 (block.magic))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE, 
+                        "not a sun_pc partition table");
+    }
+
+  if (! grub_sun_is_valid (&block))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
+    }
+
+  /* Maybe another error value would be better, because partition
+     table _is_ recognized but invalid.  */
+  for (partnum = 0; partnum < GRUB_PARTMAP_SUN_PC_MAX_PARTS; partnum++)
+    {
+      struct grub_sun_pc_partition_descriptor *desc;
+
+      if (block.partitions[partnum].id == 0
+         || block.partitions[partnum].id == GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID)
+       continue;
+
+      desc = &block.partitions[partnum];
+      p->start = grub_le_to_cpu32 (desc->start_sector);
+      p->len = grub_le_to_cpu32 (desc->num_sectors);
+      p->number = partnum;
+      if (p->len)
+       {
+         if (hook (disk, p))
+           partnum = GRUB_PARTMAP_SUN_PC_MAX_PARTS;
+       }
+    }
+
+  grub_free (p);
+
+  return grub_errno;
+}
+
+/* Partition map type.  */
+static struct grub_partition_map grub_sun_pc_partition_map =
+  {
+    .name = "sunpc",
+    .iterate = sun_pc_partition_map_iterate,
+  };
+
+GRUB_MOD_INIT(sun_pc_partition_map)
+{
+  grub_partition_map_register (&grub_sun_pc_partition_map);
+}
+
+GRUB_MOD_FINI(sun_pc_partition_map)
+{
+  grub_partition_map_unregister (&grub_sun_pc_partition_map);
+}
+