From e101bf5337bbd56c18267c164c294e72bf078c28 Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Wed, 18 Oct 2006 21:57:41 +0000
Subject: [PATCH] display driver type, correct driver signature

---
 tools/emile_scanbus.c | 84 +++++++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/tools/emile_scanbus.c b/tools/emile_scanbus.c
index bcb32d0..dbce276 100644
--- a/tools/emile_scanbus.c
+++ b/tools/emile_scanbus.c
@@ -130,9 +130,28 @@ void diskinfo(char* device)
 		int block, size, type, part;
 		emile_map_get_driver_info(map, j, 
 					  &block, &size, &type);
-		printf("     %d: base: %d size: %d type: 0x%04x",
-			       j, block * block_size / 512, 
-			       size * block_size / 512, type);
+		printf("     %d: base: %d size: %d ",
+		       j, block * block_size / 512, 
+		       size * block_size / 512);
+		printf("type: ");
+		switch(type)
+		{
+			case kDriverTypeMacSCSI:
+				printf("SCSI");
+				break;
+			case kDriverTypeMacATA:
+				printf("ATA");
+				break;
+			case kDriverTypeMacSCSIChained:
+				printf("SCSI chained");
+				break;
+			case kDriverTypeMacATAChained:
+				printf("ATA chained\n");
+				break;
+			default:
+				printf("unknown (%04x)\n", type);
+				break;
+		}
 		part = emile_map_seek_driver_partition(map, 
 					block * block_size / 512);
 		if (part == -1)
@@ -142,9 +161,6 @@ void diskinfo(char* device)
 			if (part == -1)
 				printf(" <invalid>\n");
 			emile_map_read(map, part);
-			printf(" <%d: %s [%s]>\n", part + 1,
-				emile_map_get_partition_name(map),
-				emile_map_get_partition_type(map));
 		}
 		else
 		{
@@ -157,35 +173,35 @@ void diskinfo(char* device)
 					printf(" <invalid>\n");
 				emile_map_read(map, part);
 			}
-			printf(" <%d: %s [%s], ", part + 1,
-				emile_map_get_partition_name(map),
-				emile_map_get_partition_type(map));
-			switch(emile_map_get_driver_signature(map))
-			{
-				case kPatchDriverSignature:
-					printf("patch driver");
-					break;
-				case kSCSIDriverSignature:
-					printf("SCSI HD driver");
-					break;
-				case kATADriverSignature:
-					printf("ATAPI HD driver");
-					break;
-				case kSCSICDDriverSignature:
-					printf("SCSI CDROM driver");
-					break;
-				case kATAPIDriverSignature:
-					printf("ATAPI CDROM driver");
-					break;
-				case kDriveSetupHFSSignature:
-					printf("Drive Setup HFS partition");
-					break;
-				default:
-					printf("Unknown (0x%08lx)", emile_map_get_driver_signature(map));
-					break;
-			}
-			printf(">\n");
 		}
+		printf(" <%d: %s [%s], ", part + 1,
+			emile_map_get_partition_name(map),
+			emile_map_get_partition_type(map));
+		switch(emile_map_get_driver_signature(map))
+		{
+			case kPatchDriverSignature:
+				printf("patch driver");
+				break;
+			case kSCSIDriverSignature:
+				printf("SCSI HD driver");
+				break;
+			case kATADriverSignature:
+				printf("ATAPI HD driver");
+				break;
+			case kSCSICDDriverSignature:
+				printf("SCSI CDROM driver");
+				break;
+			case kATAPIDriverSignature:
+				printf("ATAPI CDROM driver");
+				break;
+			case kDriveSetupHFSSignature:
+				printf("Drive Setup HFS partition");
+				break;
+			default:
+				printf("Unknown (0x%08lx)", emile_map_get_driver_signature(map));
+				break;
+		}
+		printf(">\n");
 	}
 	printf("  Partitions\n");
 	for (j = 0; j < emile_map_get_number(map); j++)