|
@@ -198,3 +198,195 @@ int adfspart_check_CUMANA(struct parsed_partitions *state)
|
|
|
|
|
|
dr = adfs_partition(state, name, data, first_sector, slot++);
|
|
dr = adfs_partition(state, name, data, first_sector, slot++);
|
|
if (!dr)
|
|
if (!dr)
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ name = NULL;
|
|
|
|
+
|
|
|
|
+ nr_sects = (data[0x1fd] + (data[0x1fe] << 8)) *
|
|
|
|
+ (dr->heads + (dr->lowsector & 0x40 ? 1 : 0)) *
|
|
|
|
+ dr->secspertrack;
|
|
|
|
+
|
|
|
|
+ if (!nr_sects)
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ first = 0;
|
|
|
|
+ first_sector += nr_sects;
|
|
|
|
+ start_blk += nr_sects >> (BLOCK_SIZE_BITS - 9);
|
|
|
|
+ nr_sects = 0; /* hmm - should be partition size */
|
|
|
|
+
|
|
|
|
+ switch (data[0x1fc] & 15) {
|
|
|
|
+ case 0: /* No partition / ADFS? */
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_ACORN_PARTITION_RISCIX
|
|
|
|
+ case PARTITION_RISCIX_SCSI:
|
|
|
|
+ /* RISCiX - we don't know how to find the next one. */
|
|
|
|
+ slot = riscix_partition(state, first_sector, slot,
|
|
|
|
+ nr_sects);
|
|
|
|
+ break;
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+ case PARTITION_LINUX:
|
|
|
|
+ slot = linux_partition(state, first_sector, slot,
|
|
|
|
+ nr_sects);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+ if (slot == -1)
|
|
|
|
+ return -1;
|
|
|
|
+ } while (1);
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+ return first ? 0 : 1;
|
|
|
|
+}
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_ACORN_PARTITION_ADFS
|
|
|
|
+/*
|
|
|
|
+ * Purpose: allocate ADFS partitions.
|
|
|
|
+ *
|
|
|
|
+ * Params : hd - pointer to gendisk structure to store partition info.
|
|
|
|
+ * dev - device number to access.
|
|
|
|
+ *
|
|
|
|
+ * Returns: -1 on error, 0 for no ADFS boot sector, 1 for ok.
|
|
|
|
+ *
|
|
|
|
+ * Alloc : hda = whole drive
|
|
|
|
+ * hda1 = ADFS partition on first drive.
|
|
|
|
+ * hda2 = non-ADFS partition.
|
|
|
|
+ */
|
|
|
|
+int adfspart_check_ADFS(struct parsed_partitions *state)
|
|
|
|
+{
|
|
|
|
+ unsigned long start_sect, nr_sects, sectscyl, heads;
|
|
|
|
+ Sector sect;
|
|
|
|
+ unsigned char *data;
|
|
|
|
+ struct adfs_discrecord *dr;
|
|
|
|
+ unsigned char id;
|
|
|
|
+ int slot = 1;
|
|
|
|
+
|
|
|
|
+ data = read_part_sector(state, 6, §);
|
|
|
|
+ if (!data)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ dr = adfs_partition(state, "ADFS", data, 0, slot++);
|
|
|
|
+ if (!dr) {
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ heads = dr->heads + ((dr->lowsector >> 6) & 1);
|
|
|
|
+ sectscyl = dr->secspertrack * heads;
|
|
|
|
+ start_sect = ((data[0x1fe] << 8) + data[0x1fd]) * sectscyl;
|
|
|
|
+ id = data[0x1fc] & 15;
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Work out start of non-adfs partition.
|
|
|
|
+ */
|
|
|
|
+ nr_sects = (state->bdev->bd_inode->i_size >> 9) - start_sect;
|
|
|
|
+
|
|
|
|
+ if (start_sect) {
|
|
|
|
+ switch (id) {
|
|
|
|
+#ifdef CONFIG_ACORN_PARTITION_RISCIX
|
|
|
|
+ case PARTITION_RISCIX_SCSI:
|
|
|
|
+ case PARTITION_RISCIX_MFM:
|
|
|
|
+ slot = riscix_partition(state, start_sect, slot,
|
|
|
|
+ nr_sects);
|
|
|
|
+ break;
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+ case PARTITION_LINUX:
|
|
|
|
+ slot = linux_partition(state, start_sect, slot,
|
|
|
|
+ nr_sects);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ strlcat(state->pp_buf, "\n", PAGE_SIZE);
|
|
|
|
+ return 1;
|
|
|
|
+}
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#ifdef CONFIG_ACORN_PARTITION_ICS
|
|
|
|
+
|
|
|
|
+struct ics_part {
|
|
|
|
+ __le32 start;
|
|
|
|
+ __le32 size;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static int adfspart_check_ICSLinux(struct parsed_partitions *state,
|
|
|
|
+ unsigned long block)
|
|
|
|
+{
|
|
|
|
+ Sector sect;
|
|
|
|
+ unsigned char *data = read_part_sector(state, block, §);
|
|
|
|
+ int result = 0;
|
|
|
|
+
|
|
|
|
+ if (data) {
|
|
|
|
+ if (memcmp(data, "LinuxPart", 9) == 0)
|
|
|
|
+ result = 1;
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Check for a valid ICS partition using the checksum.
|
|
|
|
+ */
|
|
|
|
+static inline int valid_ics_sector(const unsigned char *data)
|
|
|
|
+{
|
|
|
|
+ unsigned long sum;
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ for (i = 0, sum = 0x50617274; i < 508; i++)
|
|
|
|
+ sum += data[i];
|
|
|
|
+
|
|
|
|
+ sum -= le32_to_cpu(*(__le32 *)(&data[508]));
|
|
|
|
+
|
|
|
|
+ return sum == 0;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Purpose: allocate ICS partitions.
|
|
|
|
+ * Params : hd - pointer to gendisk structure to store partition info.
|
|
|
|
+ * dev - device number to access.
|
|
|
|
+ * Returns: -1 on error, 0 for no ICS table, 1 for partitions ok.
|
|
|
|
+ * Alloc : hda = whole drive
|
|
|
|
+ * hda1 = ADFS partition 0 on first drive.
|
|
|
|
+ * hda2 = ADFS partition 1 on first drive.
|
|
|
|
+ * ..etc..
|
|
|
|
+ */
|
|
|
|
+int adfspart_check_ICS(struct parsed_partitions *state)
|
|
|
|
+{
|
|
|
|
+ const unsigned char *data;
|
|
|
|
+ const struct ics_part *p;
|
|
|
|
+ int slot;
|
|
|
|
+ Sector sect;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Try ICS style partitions - sector 0 contains partition info.
|
|
|
|
+ */
|
|
|
|
+ data = read_part_sector(state, 0, §);
|
|
|
|
+ if (!data)
|
|
|
|
+ return -1;
|
|
|
|
+
|
|
|
|
+ if (!valid_ics_sector(data)) {
|
|
|
|
+ put_dev_sector(sect);
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ strlcat(state->pp_buf, " [ICS]", PAGE_SIZE);
|
|
|
|
+
|
|
|
|
+ for (slot = 1, p = (const struct ics_part *)data; p->size; p++) {
|
|
|
|
+ u32 start = le32_to_cpu(p->start);
|
|
|
|
+ s32 size = le32_to_cpu(p->size); /* yes, it's signed. */
|
|
|
|
+
|
|
|
|
+ if (slot == state->limit)
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Negative sizes tell the RISC OS ICS driver to ignore
|
|
|
|
+ * this partition - in effect it says that this does not
|
|
|
|
+ * contain an ADFS filesystem.
|
|
|
|
+ */
|
|
|
|
+ if (size < 0) {
|
|
|
|
+ size = -size;
|
|
|
|
+
|
|
|
|
+ /*
|