X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fata_id%2Fata_id.c;h=64df86c23ad429a53c951209ff4205aed7dc5ca7;hb=db634679ad58b3205910c969ac5359b1d6f625ad;hp=1e93fde4bf49362b48a2462b762ea70d148746c4;hpb=761e089b0db38d3a8297142496156e2bd5f802c1;p=elogind.git

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 1e93fde4b..64df86c23 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -52,7 +52,7 @@ static int disk_scsi_inquiry_command(int      fd,
 				     size_t   buf_len)
 {
 	struct sg_io_v4 io_v4;
-	uint8_t cdb[12];
+	uint8_t cdb[6];
 	uint8_t sense[32];
 	int ret;
 
@@ -448,6 +448,7 @@ int main(int argc, char *argv[])
 	struct udev *udev;
 	struct hd_driveid id;
 	uint8_t identify[512];
+	uint16_t *identify_words;
 	char model[41];
 	char model_enc[256];
 	char serial[21];
@@ -541,16 +542,17 @@ int main(int argc, char *argv[])
 			goto close;
 		}
 	}
+	identify_words = (uint16_t *) identify;
 
 	memcpy (model, id.model, 40);
 	model[40] = '\0';
 	udev_util_encode_string(model, model_enc, sizeof(model_enc));
-	udev_util_replace_whitespace((char *) id.model, model, 40);
-	udev_util_replace_chars(model, NULL);
-	udev_util_replace_whitespace((char *) id.serial_no, serial, 20);
-	udev_util_replace_chars(serial, NULL);
-	udev_util_replace_whitespace((char *) id.fw_rev, revision, 8);
-	udev_util_replace_chars(revision, NULL);
+	util_replace_whitespace((char *) id.model, model, 40);
+	util_replace_chars(model, NULL);
+	util_replace_whitespace((char *) id.serial_no, serial, 20);
+	util_replace_chars(serial, NULL);
+	util_replace_whitespace((char *) id.fw_rev, revision, 8);
+	util_replace_chars(revision, NULL);
 
 	if (export) {
 		/* Set this to convey the disk speaks the ATA protocol */
@@ -700,6 +702,15 @@ int main(int argc, char *argv[])
 			/* ATA devices have no vendor extension */
 			printf("ID_WWN_WITH_EXTENSION=0x%llx\n", (unsigned long long int) wwwn);
 		}
+
+		/* from Linux's include/linux/ata.h */
+		if (identify_words[0] == 0x848a || identify_words[0] == 0x844a) {
+			printf("ID_ATA_CFA=1\n");
+		} else {
+			if ((identify_words[83] & 0xc004) == 0x4004) {
+				printf("ID_ATA_CFA=1\n");
+			}
+		}
 	} else {
 		if (serial[0] != '\0')
 			printf("%s_%s\n", model, serial);