shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

Revert "cdrom_id: Try reading the medium if all MMC commands fail"

Browse Source 
Turns out we can do this much simpler by assuming that cd_media_compat() works,
which seems to be the case for the IronKey.

This reverts commit ea88774a922c734afd751a59d8102bfa4806a1a6.
This commit is contained in:
Martin Pitt 2010-10-05 14:57:04 +02:00
parent ea88774a92
commit 13e0fca5df
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
extras/cdrom_id/cdrom_id.c
View File

@ -350,34 +350,6 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si
return 0;
}
static int cd_profiles_broken_mmc(struct udev *udev, int fd)
{
struct scsi_cmd sc;
unsigned char buffer[16 * 2048];
int err;
/* we land here if both the standard and the old MMC commands failed;
* this might happen on broken wanna-be-CD USB drives like the IronKey.
* As a last resort, try to read data to see whether it has a medium.
*/
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, 16);
scsi_cmd_set(udev, &sc, 9, 0);
err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
if ((err != 0)) {
info(udev, "READ DATA failed, assuming no medium\n");
return -1;
}
/* that's all we can claim if we can read data */
info(udev, "READ DATA succeeded, assuming CD-ROM medium\n");
cd_media = 1;
cd_media_cd_rom = 1;
return 0;
}
static int cd_profiles_old_mmc(struct udev *udev, int fd)
{
struct scsi_cmd sc;
@ -392,8 +364,8 @@ 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, probing readability of medium\n");
return cd_profiles_broken_mmc(udev, fd);
info(udev, "no current profile, assuming no media\n");
return -1;
};
cd_media = 1;