From 6f540908189073dfd1f65efab7d79977533c1589 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 25 Aug 2009 18:41:24 -0700 Subject: [PATCH] cdparanoia hacks - add ENOMEDIUM, fake out scsi_inquiry() in CAM headers. --- sys/bus/cam/scsi/scsi_all.h | 2 ++ sys/sys/errno.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/bus/cam/scsi/scsi_all.h b/sys/bus/cam/scsi/scsi_all.h index 13b20e047d..27bc17c638 100644 --- a/sys/bus/cam/scsi/scsi_all.h +++ b/sys/bus/cam/scsi/scsi_all.h @@ -1197,11 +1197,13 @@ void scsi_request_sense(struct ccb_scsiio *csio, u_int32_t retries, u_int8_t tag_action, u_int8_t sense_len, u_int32_t timeout); +#ifndef CAM_NO_SCSI_INQUIRY /* hack for cdparanoia */ void scsi_inquiry(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t *inq_buf, u_int32_t inq_len, int evpd, u_int8_t page_code, u_int8_t sense_len, u_int32_t timeout); +#endif void scsi_mode_sense(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, diff --git a/sys/sys/errno.h b/sys/sys/errno.h index 6ae50bd118..15ea63696d 100644 --- a/sys/sys/errno.h +++ b/sys/sys/errno.h @@ -178,7 +178,7 @@ static __inline int *__error(void) #define EPROTO 92 /* Protocol error */ #ifndef _POSIX_SOURCE -#define EUNUSED93 93 +#define ENOMEDIUM 93 /* linux */ #define EUNUSED94 94 #define EUNUSED95 95 #define EUNUSED96 96 -- 2.41.0