#include <sys/ioctl.h>
#include <linux/cdrom.h>
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
static int debug;
static int cd_capability_compat(struct udev *udev, int fd)
{
- int capabilty;
+ int capability;
- capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
- if (capabilty < 0) {
+ capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+ if (capability < 0) {
info(udev, "CDROM_GET_CAPABILITY failed\n");
return -1;
}
- if (capabilty & CDC_CD_R)
+ if (capability & CDC_CD_R)
cd_cd_r = 1;
- if (capabilty & CDC_CD_RW)
+ if (capability & CDC_CD_RW)
cd_cd_rw = 1;
- if (capabilty & CDC_DVD)
+ if (capability & CDC_DVD)
cd_dvd_rom = 1;
- if (capabilty & CDC_DVD_R)
+ if (capability & CDC_DVD_R)
cd_dvd_r = 1;
- if (capabilty & CDC_DVD_RAM)
+ if (capability & CDC_DVD_RAM)
cd_dvd_ram = 1;
- if (capabilty & CDC_MRW)
+ if (capability & CDC_MRW)
cd_mrw = 1;
- if (capabilty & CDC_MRW_W)
+ if (capability & CDC_MRW_W)
cd_mrw_w = 1;
return 0;
}
+static int cd_media_compat(struct udev *udev, int fd)
+{
+ if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK) {
+ info(udev, "CDROM_DRIVE_STATUS != CDS_DISC_OK\n");
+ return -1;
+ }
+ cd_media = 1;
+ return 0;
+}
+
static int cd_inquiry(struct udev *udev, int fd) {
struct scsi_cmd sc;
unsigned char inq[128];
info(udev, "disk type %02x\n", header[8]);
- if ((header[2] & 3) < 4)
+ /* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */
+ if (!cd_media_cd_rom && (header[2] & 3) < 4)
cd_media_state = media_status[header[2] & 3];
+
if ((header[2] & 3) != 2)
cd_media_session_next = header[10] << 8 | header[5];
cd_media_session_count = header[9] << 8 | header[4];
if (udev == NULL)
goto exit;
- logging_init("cdrom_id");
+ udev_log_init("cdrom_id");
udev_set_log_fn(udev, log_fn);
while (1) {
fd = open(node, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
info(udev, "unable to open '%s'\n", node);
+ fprintf(stderr, "unable to open '%s'\n", node);
rc = 1;
goto exit;
}
goto exit;
}
- /* check drive */
+ /* check for media */
+ if (cd_media_compat(udev, fd) < 0)
+ goto print;
+
+ /* check if drive talks MMC */
if (cd_inquiry(udev, fd) < 0)
goto print;
if (fd >= 0)
close(fd);
udev_unref(udev);
- logging_close();
+ udev_log_close();
return rc;
}