Changed checking of ATA type if drive does not respond properly to ID…

…E status.
tombee · Oct 17, 2010 · fb6b1db · fb6b1db
1 parent 0efedd1
commit fb6b1db
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/arch-ia32/ide.c b/arch-ia32/ide.c
@@ -128,10 +128,24 @@ static void __init ata_init(void)
 				}
 			}
 
-			if(err != 0) {
-				/* TODO: Check type somehow? */
-				ide_write(&channels[i], ATA_REG_COMMAND, 
-					ATA_CMD_IDENTIFY_PACKET);
+			if(err) {
+				/* ATA type is not IDE, let's check if it's
+				 * ATAPI 
+				 */
+				uint8_t lba1 = 
+					ide_read(&channels[i], ATA_REG_LBA1);
+				uint8_t lba2 =
+					ide_read(&channels[i], ATA_REG_LBA2);
+
+				if(lba1 == 0x14 && lba2 == 0xEB) {
+					/* Drive is ATAPI */
+					ide_write(&channels[i], ATA_REG_COMMAND,
+						ATA_CMD_IDENTIFY_PACKET);
+				}
+				else {
+					/* Unknown drive type */
+					continue;
+				}
 			}
 
 			cur_drv = kmalloc(sizeof(struct identity));