2.1.7x: patches for mcdx cdrom driver

Gert Vervoort (gert.vervoort@wxs.nl)
Mon, 22 Dec 1997 15:15:04 -0500


--=====================_882839704==_
Content-Type: text/plain; charset="us-ascii"

Hi,

The following patch makes the mcdx cdrom driver compile in kernel version
2.1.7x
and makes sure that the door is locked when a cdrom is mounted.

/Gert

--=====================_882839704==_
Content-Type: text/plain; charset="us-ascii"

diff -urN /usr/src/linux-2.1.x/arch/i386/config.in linux/arch/i386/config.in
--- /usr/src/linux-2.1.x/arch/i386/config.in Fri Dec 5 20:17:52 1997
+++ linux/arch/i386/config.in Fri Dec 19 20:45:28 1997
@@ -105,10 +105,10 @@
endmenu

# Conditionally compile in the Uniform CD-ROM driver
-if [ "$CONFIG_BLK_DEV_IDECD" = "y" -o "$CONFIG_BLK_DEV_SR" = "y" -o "$CONFIG_SBPCD" = "y" -o "$CONFIG_MCD" = "y" -o "$CONFIG_CM206" = "y" -o "$CONFIG_CDU31A" = "y" ]; then
+if [ "$CONFIG_BLK_DEV_IDECD" = "y" -o "$CONFIG_BLK_DEV_SR" = "y" -o "$CONFIG_SBPCD" = "y" -o "$CONFIG_MCD" = "y" -o "$CONFIG_MCDX" = "y" -o "$CONFIG_CM206" = "y" -o "$CONFIG_CDU31A" = "y" ]; then
define_bool CONFIG_CDROM y
else
- if [ "$CONFIG_BLK_DEV_IDECD" = "m" -o "$CONFIG_BLK_DEV_SR" = "m" -o "$CONFIG_SBPCD" = "m" -o "$CONFIG_MCD" = "m" -o "$CONFIG_CM206" = "m" -o "$CONFIG_CDU31A" = "m" ]; then
+ if [ "$CONFIG_BLK_DEV_IDECD" = "m" -o "$CONFIG_BLK_DEV_SR" = "m" -o "$CONFIG_SBPCD" = "m" -o "$CONFIG_MCD" = "m" -o "$CONFIG_MCDX" = "m" -o "$CONFIG_CM206" = "m" -o "$CONFIG_CDU31A" = "m" ]; then
define_bool CONFIG_CDROM m
else
define_bool CONFIG_CDROM n
diff -urN /usr/src/linux-2.1.x/drivers/cdrom/mcdx.c linux/drivers/cdrom/mcdx.c
--- /usr/src/linux-2.1.x/drivers/cdrom/mcdx.c Wed Dec 3 19:37:55 1997
+++ linux/drivers/cdrom/mcdx.c Sun Dec 21 16:06:20 1997
@@ -75,9 +75,6 @@
#define mcdx_drive_map mcdx
#include "mcdx.h"

-#define MCDX_QUIET 0
-
-
#ifndef HZ
#error HZ not defined
#endif
@@ -288,7 +285,7 @@
NULL, /* hard reset */
mcdx_audio_ioctl, /* audio ioctl */
NULL, /* device-specific ioctl */
- CDC_OPEN_TRAY | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO
+ CDC_OPEN_TRAY | CDC_LOCK | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO
| CDC_DRIVE_STATUS, /* capability */
0, /* number of minor devices */
};

--=====================_882839704==_
Content-Type: text/plain; charset="us-ascii"

--=====================_882839704==_--