X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=e7a3e40a85e22f8a2cbb3f61a649cb842df26332;hp=5086bfa64fc1d42aded694d725f047dfad2f527c;hb=678df8a461c7573bf423a39be383bc7b70d943df;hpb=36b6aca5c108e30af9742b79eff46272be771f82

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 5086bfa64..e7a3e40a8 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -297,14 +297,9 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si
 			cd_dvd_ram = 1;
 			break;
 		case 0x13:
-			info(udev, "profile 0x%02x media_dvd_rw\n", profile);
-			cd_media_dvd_rw = 1;
-			cd_media_dvd_rw_ro = 1;
-			break;
 		case 0x14:
 			info(udev, "profile 0x%02x dvd_rw\n", profile);
 			cd_dvd_rw = 1;
-			cd_media_dvd_rw_seq = 1;
 			break;
 		case 0x1B:
 			info(udev, "profile 0x%02x dvd_plus_r\n", profile);
@@ -369,8 +364,14 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)
 	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
 	if ((err != 0)) {
 		info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
-		info(udev, "no current profile, assuming no media\n");
-		return -1;
+		if (cd_media == 1) {
+			info(udev, "no current profile, but disc is present; assuming CD-ROM\n");
+			cd_media_cd_rom = 1;
+			return 0;
+		} else {
+			info(udev, "no current profile, assuming no media\n");
+			return -1;
+		}
 	};
 
 	cd_media = 1;
@@ -486,10 +487,16 @@ static int cd_profiles(struct udev *udev, int fd)
 		cd_media_dvd_ram = 1;
 		break;
 	case 0x13:
+		info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile);
+		cd_media = 1;
+		cd_media_dvd_rw = 1;
+		cd_media_dvd_rw_ro = 1;
+		break;
 	case 0x14:
-		info(udev, "profile 0x%02x media_dvd_rw\n", cur_profile);
+		info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile);
 		cd_media = 1;
 		cd_media_dvd_rw = 1;
+		cd_media_dvd_rw_seq = 1;
 		break;
 	case 0x1B:
 		info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile);
@@ -573,6 +580,7 @@ static int cd_media_info(struct udev *udev, int fd)
 
 	cd_media = 1;
 	info(udev, "disk type %02x\n", header[8]);
+	info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]);
 
 	/* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
 	if (!cd_media_cd_rom)
@@ -588,7 +596,7 @@ static int cd_media_info(struct udev *udev, int fd)
 	 * always "complete", DVD-RAM are "other" or "complete" if the disc is
 	 * write protected; we need to check the contents if it is blank */
 	if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
-		unsigned char buffer[17 * 2048];
+		unsigned char buffer[32 * 2048];
 		unsigned char result, len;
 		int block, offset;
 
@@ -659,7 +667,7 @@ static int cd_media_info(struct udev *udev, int fd)
 		scsi_cmd_init(udev, &sc, buffer, sizeof(buffer));
 		scsi_cmd_set(udev, &sc, 0, 0x28);
 		scsi_cmd_set(udev, &sc, 5, 0);
-		scsi_cmd_set(udev, &sc, 8, 17);
+		scsi_cmd_set(udev, &sc, 8, 32);
 		scsi_cmd_set(udev, &sc, 9, 0);
 		err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
 		if ((err != 0)) {
@@ -689,8 +697,9 @@ static int cd_media_info(struct udev *udev, int fd)
 	}
 
 determined:
-	/* "other" is e. g. DVD-RAM, can't append sessions there either */
-	if ((header[2] & 3) < 2)
+	/* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in
+	 * restricted overwrite mode can never append, only in sequential mode */
+	if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro)
 		cd_media_session_next = header[10] << 8 | header[5];
 	cd_media_session_count = header[9] << 8 | header[4];
 	cd_media_track_count = header[11] << 8 | header[6];
@@ -868,13 +877,11 @@ int main(int argc, char *argv[])
 	if (cd_profiles(udev, fd) < 0)
 		goto print;
 
-	/* get writable media state */
-	if (cd_media_info(udev, fd) < 0)
-		goto print;
-
 	/* get session/track info */
-	if (cd_media_toc(udev, fd) < 0)
-		goto print;
+	cd_media_toc(udev, fd);
+
+	/* get writable media state */
+	cd_media_info(udev, fd);
 
 print:
 	printf("ID_CDROM=1\n");