Re: Amiga partition reading patch

["jdow" <jdow@earthlink.net>]

[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]

Something stripped it off. I had it called "amiga_partition_patch.dat".
That seems to be a magic suffix for too many things these days. Here it
is again.
{^_^}

----- Original Message ----- 
From: "Thomas Richter" <thor@math.TU-Berlin.DE>
To: "jdow" <jdow@earthlink.net>
Cc: <linux-kernel@vger.kernel.org>
Sent: Tuesday, 2004 August, 24 05:18
Subject: Re: Amiga partition reading patch


>
> Hi Joanne,
>
> > This is a patch known good against Mandrake 2.6.3-7mdk. I suspect it
will
> > apply to later versions equally well since the file affected appears to
> > be unchanged as late as 2.6.9-rc1.
>
> Sorry, I don't have a patch attached here. Forgot to include?
>
> > This partitioning information is known correct. I wrote the low level
> > portion of the hard disk partitioning code for AmigaDOS 3.5 and 3.9. I
> > am also responsible for one of the more frequently used partitioning
> > tools, RDPrepX, before that.
>
> I can confirm this (as "just another guy" who wrote on AmigaOs 3.9).
>
> So long,
> Thomas
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

[-- Attachment #2: amiga_partition_patch --]
[-- Type: application/octet-stream, Size: 2170 bytes --]

--- amiga.c	2004-08-09 08:52:07.268123677 -0700
+++ amiga.c.orig	2004-08-09 08:51:31.527104456 -0700
@@ -31,7 +31,6 @@ amiga_partition(struct parsed_partitions
 	struct RigidDiskBlock *rdb;
 	struct PartitionBlock *pb;
 	int start_sect, nr_sects, blk, part, res = 0;
-	int blksize = 1;	/* Multiplier for disk block size */
 	int slot = 1;
 	char b[BDEVNAME_SIZE];
 
@@ -66,14 +65,10 @@ amiga_partition(struct parsed_partitions
 			       bdevname(bdev, b), blk);
 	}
 
-        /* blksize is blocks per 512 byte standard block */
-        blksize = be32_to_cpu( rdb->rdb_BlockBytes ) / 512;
-
-	printk(" RDSK (%d)", blksize * 512);	/* Be more informative */
+	printk(" RDSK");
 	blk = be32_to_cpu(rdb->rdb_PartitionList);
 	put_dev_sector(sect);
 	for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {
-		blk *= blksize;	/* Read in terms partition table understands */
 		data = read_dev_sector(bdev, blk, &sect);
 		if (!data) {
 			if (warn_no_part)
@@ -93,32 +88,13 @@ amiga_partition(struct parsed_partitions
 		nr_sects = (be32_to_cpu(pb->pb_Environment[10]) + 1 -
 			    be32_to_cpu(pb->pb_Environment[9])) *
 			   be32_to_cpu(pb->pb_Environment[3]) *
-			   be32_to_cpu(pb->pb_Environment[5]) *
-			   blksize;
+			   be32_to_cpu(pb->pb_Environment[5]);
 		if (!nr_sects)
 			continue;
 		start_sect = be32_to_cpu(pb->pb_Environment[9]) *
 			     be32_to_cpu(pb->pb_Environment[3]) *
-			     be32_to_cpu(pb->pb_Environment[5]) *
-			     blksize;
+			     be32_to_cpu(pb->pb_Environment[5]);
 		put_partition(state,slot++,start_sect,nr_sects);
-		{
-			/* Be even more informative to aid mounting */
-			char dostype[ 4 ];
-			u32 *dt = (u32*) dostype;
-			*dt = pb->pb_Environment[ 16 ];
-			if ( dostype[ 3 ] < ' ')
-				printk( " (%c%c%c^%c)",
-					dostype[ 0 ], dostype[ 1 ],
-					dostype[ 2 ], dostype[ 3 ] + '@' );
-			else
-				printk( " (%c%c%c%c)",
-					dostype[ 0 ], dostype[ 1 ],
-					dostype[ 2 ], dostype[ 3 ]);
-			printk( "(res %d spb %d)",
-				be32_to_cpu( pb->pb_Environment[ 6 ]),
-				be32_to_cpu( pb->pb_Environment[ 4 ]));
-		}
 		res = 1;
 	}
 	printk("\n");